slideshow
fixed mege conflicts
delete jquery head call
merge conflicts exist