Update README
Merging documentation conflicts