branch test
AND simple
& simple
conflict fixed
& simple
add merge
merge with no-ff