Remove git merge markers