branch test
create branch is quick
AND simple
& simple
confict fixed
add merge
merge with no-ff