Automatic conflict merge for plain text notes

[ihsnow]

It seems it's possible to do some simple algorithm for resolving conflicts for plain text notes.
For example writing each option of a note after previous one and removing duplicate lines.
And maybe a bit more complex solution. Join all notes together but put an empty line between each pair of notes, then removing only non-empty duplicate lines, and finally, squash each sequence of 2+ empty lines into a single empty line so they are not removed completely.

It can be a new button for this with a text like "Auto-merge", with exclamation mark in a triangle and a popup should appear when a user has mouse pointer over this icon with a quick explanation what this buttons does.