THe merge of org note