conflicts
resolve_conflict. The four actions are keep new, keep existing,
keep both, and merge. Every resolution is reversible.
conflicts auto
Needs a model, so it is unavailable offline. How detection works and what each resolution does
to the version chain is in Conflicts.