updated carousel images
fixed merge conflicts