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