I would like to add a vote to add this soft of thing as an enhancement. I would love to see something like this when merging a note with conflicting changes: This is my first lineThis is my second line <<<<<<< Note 1 This is my third line - foo ======= This is my third line - bar >>>>>>> Note 2This is my fourth line There are certainly more graphical ways it could be done, but even something as simple as the above would be a big help. Thanks!