Spec §17 — Single-screen conflict resolution (no wizard). Spec §7.4 — De-dupe by eventId, server timestamp stored alongside device timestamp.
Resolve Conflicts
These items were modified by another user while you were offline. Choose which version to keep.
📱 Your Version (Offline)
Status: Used (Implanted)
Time: 10:15 AM (device)
Note: Marked during surgery
☁ Server Version
Status: Checked Out
Time: 10:30 AM (server)
By: K. Chen (Stryker)
📱 Your Version (Offline)
Status: Available (Scan In)
Surgery: Mar 5, 2026
Time: 10:22 AM (device)
☁ Server Version
Status: Already Scanned In
Surgery: Mar 4, 2026
By: M. Rodriguez (Stryker)
✓ Scan In — Hip Stem Size 14 (10:02 AM)
✓ Scan In — Bone Cement Kit (10:35 AM)
✓ Keep — Trial Heads (10:42 AM)
✓ Check Out — Retractor Set (11:05 AM)
✓ Use — Bone Screw 30mm (11:20 AM)