Index: new-game.cpp
===================================================================
--- new-game.cpp	(revision 3d96d1360b5f5b2063946add31a136ae67b551cc)
+++ new-game.cpp	(revision e1eec78b46bbc21e2acea988dcc0fdefc06f34d4)
@@ -2298,11 +2298,6 @@
          ImGuiWindowFlags_NoResize |
          ImGuiWindowFlags_NoMove);
-<<<<<<< HEAD
       ImGui::Text(ssScore.str().c_str());
       ImGui::Text(ssFps.str().c_str());
-=======
-      ImGui::Text("Score: ???");
-      ImGui::Text("FPS:   %f", fps);
->>>>>>> 446e55df316c547047dc0eb5c46189c6958dba21
       ImGui::End();
    }