Remove generated .orig files

unnecessary files generated from resolving merge conflicts