Update README.txt

test conflict pull