branch test
and simple
&simple
conflict fixed
add merge
merge with no-ff
fix bug 101
commint merge dev
fix bug 101 second
merged bug fix 101 second
   go