Adding changes made to model that was changed while i did not have the model checked out.

I somehow undid a check out and continued to make changes to my model. During that time, a coworker checked it out and made changes. Is there a way to incorporate my changes without overwriting his?

Running Creo 3.0 and Windchill

23 years using Pro/E... rookie mistake.