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