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