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