AND simple
& quick
conflict fixed
no-ff
merge with no-ff