> When Sync downloads a new version of a file, and finds that there are conflicts with the local version, the changes are merged with Google's diff-match-patch algorithm.

Based on the docs it doesn't sound like you can intervene in this process manually. Standard Notes creates a conflicted copy of the note instead, and that's what I'd prefer.

Sad that it seems like every notes app with sync seems to have at least one showstopping issue like this.