Updated readme
Fixed conflicts
Updated readme