branch test
and simple
& simple
conflict fixed
del and simple
merge with no-ff