Remove .orig conflict files

These were added in merge d8ee88b81ec7a575911e54ffb204e3fa43a24e2a
Merge pull request #384 from fson/remove-orig-files

Remove .orig conflict files