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