update README.md
update README.md and resolve conflicts