Update README.md

added a conflict