resolved merge conflicts
slides and doc download finally working