Update README.md
resolve conflicts