Removed git conflict markers