add branch-creating is quick
AND simple
& simple
conflict fixed
dev added
merge with no-ff