If something conflicts, just delete it

We could probably do something more sophisticated in the future, but for now I think this is good enough.