diff --git a/components/About.tsx b/components/About.tsx
index 7c0c2f4..abdbc14 100644
--- a/components/About.tsx
+++ b/components/About.tsx
@@ -126,11 +126,7 @@ export function About() {
             animate={isInView ? { opacity: 1, x: 0 } : {}}
             transition={{ duration: 0.8, delay: 0.2 }}
           >
-<<<<<<< HEAD
             <div className="bg-gradient-to-br from-rose-100/30 via-pink-100/30 to-orange-100/30 dark:from-rose-900/20 dark:via-pink-900/20 dark:to-orange-900/20 rounded-2xl md:rounded-3xl p-6 md:p-8 border border-border/50 backdrop-blur-sm">
-=======
-            <div className="bg-gradient-to-br from-rose-100/15 via-pink-100/15 to-orange-100/15 dark:from-rose-900/15 dark:via-pink-900/15 dark:to-orange-900/15 rounded-3xl p-8 border border-border/50 backdrop-blur-sm">
->>>>>>> 79a5bb9fb99183cdae6841a62b115a1f8b88161e
               <motion.h3
                 className="text-xl sm:text-2xl font-semibold mb-3 md:mb-4 bg-gradient-to-r from-rose-600 via-pink-600 to-orange-600 bg-clip-text text-transparent"
                 initial={{ opacity: 0 }}
diff --git a/components/Services.tsx b/components/Services.tsx
index 134a32b..568e90d 100644
--- a/components/Services.tsx
+++ b/components/Services.tsx
@@ -2,14 +2,9 @@
 
 import { motion } from "framer-motion";
 import { useInView } from "framer-motion";
-<<<<<<< HEAD
 import { useRef } from "react";
 import { Baby, Brain, HeartHandshake, Sparkles, Users2, Shield } from "lucide-react";
 import { useAppTheme } from "@/components/ThemeProvider";
-=======
-import { useRef, useEffect, useState } from "react";
-import { Users, Sparkles, Heart, Users2, Feather, Shield } from "lucide-react";
->>>>>>> 79a5bb9fb99183cdae6841a62b115a1f8b88161e
 
 export function Services() {
   const ref = useRef(null);