Remove left-over merge marker.