If you need to compare the contents of two files Notepad++ has a great plugin for doing just that. Begin by opening the Plugin Manager from the Plugins menu:
Next select the Compare plugin and click Install:
Now open both of the files you would like to compare as two separate tabs in Notepad++. Then from the Plugins menu selecct Compare -> Compare (or use the shortcut Alt+D):
Your two files will now be opened side-by-side with conflicting lines highlighted. You can use the blue arrows on the toolbar to navigate between each alert.