Fixed the carousel
Merge