remove git conflict comments