Add carousel images data type
Fix merge conflicts