branch text
and simple
& simple
conflict fixed
add
merge with no-ff