Drop substring notes during notes merging

This makes merging behave the same way when adding, and results in
substrings being removed when merging notes from different sources
as well.