AND simple
&simple
conflict fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101
do something
do another thing
fix the conflict from merge