Updated readme
Fixed merge