edited slides
merging