From 0db6e599c91bf40128a316218b48b33fcf1a8b24 Mon Sep 17 00:00:00 2001
From: StephDietz <steph.dietz@vercel.com>
Date: Wed, 12 Jul 2023 10:35:41 -0500
Subject: [PATCH] merge conflict fix

---
 components/carousel.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/carousel.tsx b/components/carousel.tsx
index 2a8d2526f..72bb4d47d 100644
--- a/components/carousel.tsx
+++ b/components/carousel.tsx
@@ -10,8 +10,8 @@ export async function Carousel() {
   if (!products?.length) return null;
 
   return (
-    <div className="relative w-full overflow-hidden pb-6">
-      <div className="flex animate-carousel space-x-4">
+    <div className="relative w-full pb-6 overflow-hidden">
+      <div className="flex space-x-4 animate-carousel">
         {[...products, ...products].map((product, i) => (
           <Link
             key={`${product.handle}${i}`}
@@ -21,7 +21,7 @@ export async function Carousel() {
             {product.featuredImage ? (
               <Image
                 alt={product.title}
-                className="h-full object-contain"
+                className="object-contain h-full"
                 fill
                 sizes="33vw"
                 src={product.featuredImage.url}