Removing git merge conflict tags

Accidentally left them in.