new readme.txt
resolve the merge