Drafted UI patterns for conflict resolution that don’t scare users.
Principle: if sync is inevitable, make the merge the hero, not a cryptic error.