Remove bogus merge