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