diff --git a/index.html b/index.html
index 75ba7f2..4bd2860 100644
--- a/index.html
+++ b/index.html
@@ -19,25 +19,12 @@
         }
     </style>
 </head>
-<<<<<<< HEAD
-<body class="dark-background">
-    
-    <h1 class="lead" style="font-size: 48px;"><em>Ocena Zachowania</em></h1>
-
-
-
-    <div>
-        <button onclick="showTab('criteria')">Ocena z zachowania</button>
-        <button onclick="showTab('stats')">Statystyka</button>
-        <button onclick="showTab('points')">Ustal punkty</button>
-=======
 <body>
     <header class="header-box">
     <div class="up-button">
         <button class="active" onclick="showTab('criteria')">Ocena z zachowania</button>
         <button class="active" onclick="showTab('stats')">Statystyka</button>
         <button class="active" onclick="showTab('points')">Ustal punkty</button>
->>>>>>> g/tom
     </div>
     <h1 id="header-title" class="header-title">Ocena Zachowania</h1>
 </header>
