Updated readme.txt file locally
merge readme conflict