vimdiff is NOT a valid mergetool - there were leftover diff junks