removed merge conflict code
added slideshow to main page