diff --git a/src/opengnsys/modules/server/OpenGnSys/__init__.py b/src/opengnsys/modules/server/OpenGnSys/__init__.py
index db855f8..b20ed86 100644
--- a/src/opengnsys/modules/server/OpenGnSys/__init__.py
+++ b/src/opengnsys/modules/server/OpenGnSys/__init__.py
@@ -91,12 +91,9 @@ class OpenGnSysWorker(ServerWorker):
         """
         Sends OGAgent activation notification to OpenGnsys server
         """
-<<<<<<< HEAD
         t = 0
         # Generate random secret to send on activation
         self.random = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(self.length))
-=======
->>>>>>> #750: Adapting route {{GET /command}}} parameters.
         # Ensure cfg has required configuration variables or an exception will be thrown
         url = self.service.config.get('opengnsys', 'remote')
         if operations.os_type == 'ogLive' and 'oglive' in os.environ: