add merge
merger with no-ff
fix bug 101