Remove errant merge marker