Resolve merge conflict

Author: SelwynAng

docker-compose.yml

@@ -35,4 +35,10 @@ services:
     ports:
       - $MATCHING_SVC_PORT:$MATCHING_SVC_PORT
     environment:
-      - PORT=$MATCHING_SVC_PORT
+      - PORT=$MATCHING_SVC_PORT
+
+  redis:
+    image: redis:7.4-alpine
+    restart: always
+    ports:
+      - 6379:6379