created slideshow
conflict fixes