diff --git a/src/framework/engine.cpp b/src/framework/engine.cpp
index 5c95dc10..200dea5a 100644
--- a/src/framework/engine.cpp
+++ b/src/framework/engine.cpp
@@ -108,8 +108,7 @@ void Engine::run()
             
             // swap buffers
             Platform::swapBuffers();
-<<<<<<< HEAD
-            
+           
             /*
             static ConnectionPtr connection = g_connections.createConnection();
             
@@ -127,9 +126,7 @@ void Engine::run()
             }
             */
         //}
-=======
         }
->>>>>>> f3eaf3f7262bf6ef35cee745d40088669526125a
     }
 
     m_stopping = false;