Update README.md

Added merge conflict line