Updated readme
Fixed conflicts