merge

merging edits for docs and slideshow