add branch test
AND simple
& simple
conflict fixed
add commit
merge with no -ff