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