Update README.md
Fix conflict