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