This is one of the best explanations I have found on how to solve a merge conflict.
– Open the file and solve the conflict, deleting the code you discard as well as the “<<<<“
– git add the file
– git commit
and then follow as normal git push, git pull etc