A concrete conflict resolver that can uses DiffMatchPatch to resolve conflict. This resolver should be configurable to allow for auto-merging.