Remove note barriers within notes when merging
WIP
WIP
Maintain note barriers