test branch dev
AND simple
& smiple
conflict fixed.
test no-ff.
merge with no-ff