creating a new branch is quick.
AND simple.
& simple
conflict fixed