Cleaning mergetool leftovers