Resolve a disk conflict
A disk conflict happens when the same note changed in two places since the last sync, and Notate needs you to choose which version wins.
What causes it
A conflict appears when the same note changed both on disk, edited in another app, and on the server since the last sync.
Resolve it
Notate flags it with a banner noting that notes changed on two devices. Tap Resolve to open a review screen where you choose which version to keep for each note.