Resolved merge conflict in the docs file