When a conflict occurs, Joplin first copies the current
local note to a new Conflicts folder. Then it replaces the local note with the latest from the server.
It doesn't automerge. You have to merge manually. The plugin simply helps you out by showing a diff window.
The conflicts folder should appear on your PC colored Red.