branch test
AND simple
AND a simple
& simple
conflict fixed
add merge
merge with no-ff
fix bug 1010
mergerd bug 101