AND simple
& simple
conflict fixed
test no-ff
another conflict
test no-ff
merge with no-ff