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