branck test
AND simple
add 111
add 222
conflict fixed
add merge
merge with no-ff