git mergetool has a nasty habit of mangling umlats - fix ones that have been missed in previous submissions