Fix merge conflicts

I think this is right. And broken, mergetool was misbehaving.