edit README
edit README.md
merge
Resolve