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