Update documentation
Update documentation
Resolved merge conflicts
Fixed additional merge conflicts