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