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