removed git conflict markers.