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