i knew mergetool was a bad idea