Updated README
Fixed conflict