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