merge conflict fixed
update README.md
delete README.md from local