vranch test
AND simple
& simple
cpnflict fixed
add merge
merge with no-ff