Update readme.txt

test to pull in conflict.
Update readme.txt

test to conflict when pulling.