If something conflicts, just delete it
Merge pull request #4 from jackfranklin/fix-conflict-errors

If something conflicts, just delete it