mergetool leftovers