added carousel on homepage
resolved merge