You seem to have direct conflict on a file, the best and fastest way to solve it, is depending if you are using SVN or git. Download TortoiseSVN or TortoiseGIT depending what you are using and use that tool to see what files you need to resolve. You'll get access to use the tool within the project folders and resolve the issue with that tool directly on the conflicted folders.