resolve conflict

Author: TabrizPlv

docker-compose.local.yaml

@@ -55,19 +55,6 @@ services:
       - "${MATCHING_DB_HOST_MGMT_PORT}:8001"
       - "${MATCHING_DB_HOST_PORT}:6379"
     restart: unless-stopped
-  
-  collab-db:
-    hostname: "collab-db"
-    image: postgres:16.4
-    container_name: "collab-db"
-    env_file:
-      - ./backend/collaboration/.env.local
-    volumes:
-      - "collab-db-docker:${COLLAB_PGDATA}"
-      #  - ./init.sql:/docker-entrypoint-initdb.d/init.sql
-    ports:
-      - "${COLLAB_EXPRESS_DB_PORT}:5432"
-    restart: unless-stopped
 
 volumes:
   user-db-docker:
@@ -77,6 +64,4 @@ volumes:
   collab-db-docker:
     external: true
   match-db-docker:
-    external: true
-  collab-db-docker:
-    external: true
+    external: true