The hardest screen was never the editor. It was the one that told you two devices disagreed.
Conflicts should read as a choice, not an error: two versions, both kept, one picked. We learned that the slow way.