bugs fixed at AssureNoteParser
fast-forward merge
fixed merge algorithm