add note
merge branches
add branch and unbranch functions