branch test
AND simple
&simple
fix the conflict
add branch manager
merge with no-ff