Undo git's fuck-up.

How the fuck can you have merge conflicts when you're the only person
using a repository?  Git, go jump off a cliff.