Update README.md

Resolved conflict.