Removed merge conflict tokens that weren't deleted.