Adds carousel
Fixes conflict :metal: