branch test
AND simple
& simple
conflict fixed
& readme.txt the 2s
& readme.txt the 3s
& readme.txt the 3s master
& readme.txt the 3s master -fix conflict
add merge
merge without no-ff