branch test
simple text
simple text
&simple text
conflict add
add merge
merge with no -ff