remove pesky mergetool orig files