branch test
and simple
& simple
conflict fixed
no fast forward
merge with no-ff
fix bug 101
merge bug fix 101