33661 update conflict handling

Update conflict handling to enable the use of CDTMutableDocumentRevision as a conflict resolution.
Ideally the work in this PR should support selecting a deleted revision as the resolved one. Clearly this won't be a mutable revision so the test in DatastoreConflicts.m should be un-commented and this one deleted