Remove conflict comments