Sorry, I somehow missed your original post.
This is how I resolve conflicts:
- I duplicate the note in the
Conflictsfolder (renaming doesn't work, because the id would still be the same) - I move it to the same folder as the original note
- delete the note in the
Conflictsfolder - sync
- I use an external diff tool (usually just copy and paste the content into it) to check what the differences are and maybe create a new note with stuff from both
- copy back the new content to the orig note, delete the duplicated note