when you see the <<<<<< in your files - it means that you had a merge conflict with git. git then adds in both versions of the file so you can choose which version you should keep (in most cases git can figure out how to merge 2 versions of files, but in your case it couldn't). You should delete out the version that you do not want to keep. This section is what is on master.