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