Removed lingering merge marker