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