diff --git a/src/components/ImageGallery.tsx b/src/components/ImageGallery.tsx
index 6ee801a..1d22a91 100644
--- a/src/components/ImageGallery.tsx
+++ b/src/components/ImageGallery.tsx
@@ -26,9 +26,13 @@ export default function ImageGalleryX()
       <ImageGallery
         items={items}
         showFullscreenButton={true}
+<<<<<<< HEAD
         showThumbnails={true}
         showBullets={true}
         showIndex={true}
+=======
+        showThumbnails
+>>>>>>> aa24ef1ee23d34c514b5a3c10f713c7bfae99719
       />
     </div>
   );