Update documentation
Update documentation
Resolved merge conflicts
Update documentation
Fixed additional merge conflicts