changes to the carousel on mobile
fixed conflicts
merging conflicts
small changes