joplin-plugin-conflict-resolution (npm): This plugin adds a context menu option on conflict notes to open a merge menu. Once clicked a diff viewer will be shown to aid in merging the notes together.
Keywords: joplin-plugin