documentation updates, disabled blog locally
resolved merge conflict