Updates to documentation

Update conflict resoution documentation to make it clear that
CDTMutableDocumentRevisions can be returned in conlfict resolvers.
How about: "If you wish to merge revisions to create a new winning revision, call mutableCopy on a CDTDocumentRevision you wish to be parent revision, and then merge the data from the conflicted revisions into the new revision"