create a branch is fast
ad simple
simple
conflict fix
add a dev branch
merge with no ff