branch text
ADD simple
&simple
conflict fixed