remove git merge conflict syntax