Fixed merge conflicts

docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.0"
 services:
   main:
     build: .
-    image: registry.alpha.grandlyon.com/refonte-data/minio-master-slave-mirror-tool:${TAG}
+    image: registry.forge.grandlyon.com/web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/tools/minio-master-slave-mirror:${TAG}
     volumes:
       - ./config-docker.yaml:/app/config.yaml
       - tmp:/tmp