Removed git conflict characters