branch test
AND SAMPLE
&sample
conflict fixed
add merge
merge with no ff