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