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