branch test
like this
creating a new branch is quickly & simple.
conflict fixed
add merge
merge with no-ff
fix bug 101
merged bug fix 101