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