Major Description
currently ConflictHandler_s are provided _ours and theirs, reflecting a memory state and persisted state of changes to the same root resulting in a conflict.
unfortunately the information provided to ConflictHandlers does not include the common ancestor, needed for meaningful change-change merges (three-way merge).
the core should be enhanced to provide such information to ConflictHandlers.