Leftover git merge text in files