branch test
switch test
AND Simple
&simplee
confict
addmerget
merge with no no-ff