fix merge conflicts; don't add relics of 'git mergetool'