added background image slideshow
fixing code conflicts