add merge
merge with no-ff
fix bug 101
merged bug fix 101
after fix bug.
back to master
merge with no-ff