not --no-ff
is --no-ff
merge with no-ff
not --no-ff
is --no-ff
merge with no-ff