diff --git a/index.php b/index.php
index 0e258b1..5dac6c6 100644
--- a/index.php
+++ b/index.php
@@ -11,15 +11,10 @@
                 printf("<h3>Join on server.thisfro.ch!</h3>");
                 printf("<p>The Server is: </p>");
                 printf("<h2 class='online status'>online</h2>");
-                printf("<p>running version:</p>");
+                printf("<p>running version</p>");
                 printf("<h2>%s</h2><br>", $ms->get_version());
-<<<<<<< HEAD
-                printf("<p>Players online:</p>");
-                printf("<h2>%s / %s</h2>", $ms->get_current_players(), $ms->get_max_players());
-=======
                 printf("<p>Players online</p>");
                 printf("<h2>%s / %s</h2>)", $ms->get_current_players(), $ms->get_max_players();
->>>>>>> effa2a3d35936394ce471d0870b9ac188b0177f9
             }
             else {
                 echo("<p>The Server is:</p>");