fix bug by keepnote
merge