add merge
merge with no-ff
add clone
fix bug 101
fix bug