add readme.txt
change readme.txt
branch test
AND simple
& simple
conflict fixed
add merge
merge with no-ff
no
no3
yes