add merge
merge branch 'dev' with no-ff
fix bug 101
merged bug fix 101