Fix a mergetool derp