Fixed spacing in readme
Fixed readme and merge conflicts