branch test
simple
&simple
conflict fixed
and smart
merge with no-ff
fix bug 101
merged bug fix 101