modified readme.txt in dev branch
modified readme.txt
resolve conflict