diff --git a/src/App.js b/src/App.js
index 3fb2473..d138b12 100644
--- a/src/App.js
+++ b/src/App.js
@@ -14,18 +14,9 @@ function App() {
 
     return (
         <div className="app">
-<<<<<<< HEAD
-            <div className="log-head">
-                <header className="header">
-                    <Navbar isAuthenticated={isAuthenticated} user={null} />
-                    {/* tutaj przesyla uzytkownika */}
-                </header>
-            </div>
-=======
             
             <Navbar isAuthenticated={isAuthenticated} user={null} />
                     {/* tutaj przesyla uzytkownika */}
->>>>>>> f473ffc (new styles for the home menu abrs)
 
             <Home isAuthenticated={isAuthenticated} />  
         </div>
diff --git a/src/Home.scss b/src/Home.scss
index 13d47e8..925d2b3 100644
--- a/src/Home.scss
+++ b/src/Home.scss
@@ -82,37 +82,6 @@ $medium: 900px;
     .info-boxes {
         display: flex;
         flex-wrap: wrap;
-<<<<<<< HEAD
-        gap: 20px;
-        justify-content: center;
-        width: 100%;
-
-        .info-box {
-            background: $info-box-bg;
-            border: 1px solid $info-box-border;
-            border-radius: 10px;
-            padding: 20px;
-            width: 300px;
-            box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-            text-align: center;
-
-            &.large {
-                width: 100%;
-                max-width: 800px;
-            }
-
-            h2 {
-                color: $info-box-text;
-                margin-bottom: 10px;
-            }
-
-            p {
-                color: $text-color;
-                font-size: 1em;
-            }
-        }
-    }
-=======
         justify-content: space-around;
         padding: 2rem;
 
@@ -250,5 +219,4 @@ $medium: 900px;
             
         }
     }
->>>>>>> f473ffc (new styles for the home menu abrs)
 }