branch test
AND simple
& simple
conflict fixed
add &
add %
add conflict
disabled fast forward
merge with no-ff