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