app/components/Carousel.tsx

@@ -11,8 +11,11 @@ import {
   CarouselPrevious,
   type CarouselApi,
 } from "@/ui/carousel";
+<<<<<<< HEAD:app/components/untils/Carousel.tsx
 import FireNewsList from "./FireNewsList";
+=======
   const imageUrls = [
+>>>>>>> 1d49f000efd9f3e6ac13da4e459b8e1e600c3335:app/components/Carousel.tsx
 
   "/images/carousel-1.jpg",
   "/images/carousel-2.jpg",
@@ -59,12 +62,24 @@ export function CarouselDemo() {
             <CarouselItem key={index}>
               <div className="p-1">
                 <Card>
+<<<<<<< HEAD:app/components/untils/Carousel.tsx
+                  <CardContent className="flex aspect-square items-center justify-center ">
+                    <div 
+                    className="w-full h-full"
+                    style={{
+                      backgroundImage: "url('/app/images/header.png')",
+                      backgroundSize: '100% 100%',
+                    }}
+                    >
+                    </div>
+=======
                   <CardContent className="flex aspect-square items-center justify-center p-6">
                      <img
                       src={src}
                       alt={`Slide ${index + 1}`}
                       className="w-full h-full object-cover"
                     />
+>>>>>>> 1d49f000efd9f3e6ac13da4e459b8e1e600c3335:app/components/Carousel.tsx
                   </CardContent>
                 </Card>
               </div>

app/routes/news.tsx

@@ -19,7 +19,6 @@ export default function Home() {
     <div>
       <Header />
       <TopNav />
-      
       <NewsList />
       <ImageGridSection />
       <Integrated />