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