branch test
test 1
test two
init
AND simple
& simple
conflict fixed
add merge
merge with no-ff