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