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