X8B6 replaced version numbers and overwrite buttons with explanations of the local action, confirmed state, and intervening change.
#conflict-resolution
A deterministic timestamp merge made X8B6 converge by silently erasing one legitimate inventory action, proving that conflict resolution needed domain verbs.