We should probably mention here that the output of this method should be deterministic, that is, for the given docId and conflict set the same new revision should be returned for all calls. It also shouldn't have externally visible effects, beyond the changes we apply to the conflicted document, as we don't guarantee that the returned revision will be amended to the document tree (even though the current code appears to guarantee it, the contract for the method doesn't).