Remove erronious merge marker