Test for branch
AND simple
simple and
conflict fixed