CURSE YOU MERGETOOL

You're supposed to clean up your random files when you're done!

This is why I usually check `git status` a bunch before committing.

This PR does nothing except remove a file that never existed.