A field-level three-way merge for concurrent edits — base/mine/theirs per field, only the genuinely conflicting fields asked about as radiogroups, bulk fill with per-field override, and a merged record on submit.