Correctly fix merge magic.