diff --git a/app/routes/news.tsx b/app/routes/news.tsx
index 466d68f..da46f27 100755
--- a/app/routes/news.tsx
+++ b/app/routes/news.tsx
@@ -14,10 +14,6 @@ import { Hotline } from "@/components/news/body/FireNews/Hotline";
 import { AutoCarouselDemo } from "@/components/AutoCarousel";
 import { Footer } from "@/components/news/footer/footer";
 import { CarouselDemo } from "@/components/Carousel";
-<<<<<<< HEAD
-=======
-
->>>>>>> c14daff3c048d7b97f1a2e62ab201d234aaf0e77
 
 export function meta( ) {
   return [