branch test
AND simple
& simple
conflict fixed
delete 3 row from readme3.txt
merge with no-ff