remove orig files from merges that got into the repo