to allow a more fine [...] (allows merging [...] .) AllowMixedRevisions =
allows conflict [...] _conflict_resolution_use_markers. Reading it always [...] allows conflict