add a branch line
AND simple
& simple
conflict fixed