33661 update conflict handling

Update conflict handling to enable the use of CDTMutableDocumentRevision as a conflict resolution.
You didn't miss it, I just making I note where I inserted them :)