dev
AND simple
& simple
conflict fixed
--on-ff
--no-ff need msg