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