Update documentation
Republishing.
Republishing.
fixed merge conflict.