I recommend the following way to resolve conflicts due to synch errors:-
Double click note with conflicts to open a separate window with the note
Align that window with the display of the same note in the E/N display panel
Scroll down to the top of the note below the "Conflicting Modification" banner in the separate window
Now you can easily compare versions of the same note for differences - I use copy & paste to make corrections to the note in the display panel - and delete the text in the separate window as I go...
When you get to the bottom of the note in the separate window, you should have deleted all of the text below the "conflict" banner
It's a manual fix, but easy to implement - and no need for other software.