Updated readme.
Fixed merge conflicts