removing git merge text