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