Remove git-conflict comments