33661 update conflict handling

Update conflict handling to enable the use of CDTMutableDocumentRevision as a conflict resolution.
Also shouldn't this return a more appropriate error constant?