Removed some conflict markers.