diff --git a/src/components/Header.jsx b/src/components/Header.jsx
index eb0f21f..deb40e6 100644
--- a/src/components/Header.jsx
+++ b/src/components/Header.jsx
@@ -1,6 +1,5 @@
 import { Link } from "react-router-dom";
 const Header = () => {
-<<<<<<< HEAD
   return (
     <header>
       <h1>
@@ -23,14 +22,5 @@ const Header = () => {
     </header>
   );
 };
-=======
-  
-    return (
-        <header>
-            <h1><a href="#0"></a></h1>
-        </header>
-    );
-}
->>>>>>> homepage
 
 export default Header;
diff --git a/src/main.jsx b/src/main.jsx
index eea7121..b80fa22 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -8,9 +8,7 @@ import Services from "./components/Services";
 
 createRoot(document.getElementById("root")).render(
   <StrictMode>
-    <Navbar />
-    <Hero />
-    <Services />
+    
     <AppRouter />
     
   </StrictMode>
diff --git a/src/routers/AppRouter.jsx b/src/routers/AppRouter.jsx
index 475a255..91252f8 100644
--- a/src/routers/AppRouter.jsx
+++ b/src/routers/AppRouter.jsx
@@ -11,6 +11,7 @@ import HomePage from "../pages/HomePage";
 import LoginPage from "../pages/LoginPage";
 import PageCodeEditor from "../pages/CodeEditor";
 import PageNotFound from "../pages/PageNotFound";
+import Hero from "../components/Hero";
 
 const AppRouter = () => {
   return (
@@ -18,17 +19,17 @@ const AppRouter = () => {
       <div className="wrapper">
         <Header />
         <Routes>
-          <Route path="/login" element={<LoginPage />} />
-          <Route
+        <Route
             path="/"
             element={
               <ProtectedRoute>
-                <HomePage />
+                <Hero/>
               </ProtectedRoute>
             }
           />
+          <Route path="login" element={<LoginPage />} />
           <Route
-            path="/editor"
+            path="editor"
             element={
               <ProtectedRoute>
                 <PageCodeEditor />