add merge
merge with no-ff
fixed 101 bug
commit
test
ci test