slight change to docs
resolved merge conflict