and simple
&simple
conflict fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101
test
Merge branch 'dev'
add
add merge
add merge1
merge with no-ff