No idea why I need to do this
Change how to delete conflicts

Conflict deletion in resolveConflicts required creating a revision
with a dummy revId. This method was a hack and has been replaced by
creating a new DocumentRevison with the deleted flag set to YES.
This will cause all branches in the tree to be tombstoned.