Sync conflicts

Cards in this group · 3

1. I3.04.1Conflicts must surface; the system must not silently pick a winner
2. I3.04.2Resolving a conflict must keep both versions available
3. I3.04.3Last-write-wins silently discards the other edit