diff --git a/docker-compose.yml b/docker-compose.yml
index 26d98f5cf6..ae8b58f13d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,4 +25,7 @@ services:
       NODE_ENV: development
     #command: ["npm", "run", "server"]
     command: ["npm", "run", "server"]
+<<<<<<< HEAD
     
+=======
+>>>>>>> 1cd7482f (update test-collab branch to contain all the logic to test the collaboration locally (#4077))
diff --git a/planet/js/ServerInterface.js b/planet/js/ServerInterface.js
index 9d59e0fd80..3960ef1a46 100644
--- a/planet/js/ServerInterface.js
+++ b/planet/js/ServerInterface.js
@@ -25,7 +25,6 @@ class ServerInterface {
 
     constructor(Planet) {
         this.ServerURL = "https://musicblocks.sugarlabs.org/planet-server/index.php";
-        // this.ServerURL = "http://0.0.0.0:8080/planet-server/index.php";
         this.ConnectionFailureData = {"success": false, "error": "ERROR_CONNECTION_FAILURE"};
         this.APIKey = "3f2d3a4c-c7a4-4c3c-892e-ac43784f7381";
     }
@@ -95,4 +94,4 @@ class ServerInterface {
 
     init() { };
 
-}
+}
\ No newline at end of file