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