Update documentation
Resolved merge conflicts