git mergetool made a mess

Cleaned up the ORIG files