forgot to change some messages from git mergetool