branch test
AND simple
&simple
conflict fixed
2345