Updates to documentation

Update conflict resoution documentation to make it clear that
CDTMutableDocumentRevisions can be returned in conlfict resolvers.
Either put "eg CDTMutableDocumentRevision has a parent revision" in brackets, or put a comma after this clause