branch test
AND simple
& simple
conflicr fixed
add branch manage
merge with no-ff