Removed git conflict comments