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