Fix mergetool brainfart