Resolved Merge imgCarousel Conflict