Removed stray merge remnants