If you have two different versions of the file after resolving this scenario (similar content, different file names), you ...

If you have two different versions of the file after resolving this scenario (similar content, different file names), you will most likely need to resolve the differences in the two files.  You should consider using the Compare and Combine commands (on the Review tab, in the Compare group) to resolve the differences between the two files.