Whoops. Only merge the right ones. Still a bug relating to findEntireNote and note barriers
Sorted out merging bug. Only fire when content has changed