diff --git a/src/components/Navbar.css b/src/components/Navbar.css
index b271d9b..eef2225 100644
--- a/src/components/Navbar.css
+++ b/src/components/Navbar.css
@@ -1,9 +1,5 @@
 .navbar {
     display: flex;
-<<<<<<< HEAD
-    position: relative;
-=======
->>>>>>> main
     width: 100vw;
     align-items: center;
     justify-content: space-between;
@@ -155,4 +151,4 @@
         height: 45px;
         margin-right: 60px;
     }
-}
\ No newline at end of file
+}