diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index dd622d2a0..0de71fe3c 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -2732,13 +2732,10 @@ bool FurnaceGUI::loop() {
       midiLock.unlock();
     }
 
-<<<<<<< HEAD
     eventTimeEnd=SDL_GetPerformanceCounter();
 
     layoutTimeBegin=SDL_GetPerformanceCounter();
-    
-=======
->>>>>>> Commander X16 file export: ZSM format
+
     ImGui_ImplSDLRenderer_NewFrame();
     ImGui_ImplSDL2_NewFrame(sdlWin);
     ImGui::NewFrame();