add merge
merge with no-ff
fix a bug 101
merged bug fix 101