merge with no-ff
fix bug 101
merged bug fix 101
a new add merge from dev
merged dev
merge with dev