changed readme
Resolve merge conflict?