Back. To. Normal.

You know, I don't really care about there being conflicts if I'm
deleting the file anyways. But, hey, whatever.