brance test
AND simple
& simple
conflict fixed
test branch
merge with no-ff