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