Updated README.
Fixed conflict.