This is the goto-plugin for whenever you're facing conflict issues! It'll provide a nice diff-window in which you can see the differences between your current note and the note received from cloud.
After you have a conflict note, you can simply right click the note in the conflicts folder and then you'll see a new button called
Resolve Conflict. Pressing it will open the diff-window.
In the case of using the plugin on an old conflict, the plugin may fail to find the source note to compare to, so, it'll open for you another window, in which, you can select the other note which you want to compare it. (Beware that this selected note will be overwritten with the new merged note!)
You can get the latest version of the plugin through Joplins Plugin Repository inside of Joplin itself.
Please report any bugs you find and/or any features you'd like to see over at Github here: Issues · joplin/plugin-conflict-resolution · GitHub
However, if you don't have a Github account, reporting here in this thread also works