add merge
merge with no-ff
fix bug 1
something over