removed slides from md
resolved merge conflicts