Remove merge conflict resolution files

Pull request #2587 inadvertently added intermediate merge conflict
resolution files (BACKUP, BASE, LOCAL, REMOTE) to the repository. This
happened after a three-way merge was started and then canceled without
`git rebase --continue` being run.
Merge pull request #2594 from openjck/remove-merge-conflict-files

Remove merge conflict resolution files