diff --git a/docker-compose.yaml b/docker-compose.yaml
index 1beff39..b724ee4 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -27,12 +27,6 @@ services:
       dockerfile: delegator.dockerfile
     depends_on:
       - runtime
-<<<<<<< HEAD
-    ports:
-      - "5678:5678/udp"
-      - "5679:5679/tcp"
-=======
->>>>>>> f5e88e4 (graceful shutdown)
     deploy:
       resources:
         limits:
@@ -44,12 +38,6 @@ services:
       dockerfile: executor.dockerfile
     depends_on:
       - runtime
-<<<<<<< HEAD
-    ports:
-      - "5698:5678/udp"
-      - "5699:5679/tcp"
-=======
->>>>>>> f5e88e4 (graceful shutdown)
     deploy:
       resources:
         limits: