add a branch line
AND simple
& simple
conflict fixed
test
merge with no-ff