Updated README
Fixed conflicts