diff --git a/Dockerfile b/Dockerfile
index b0fd28e..ef0ccd6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ COPY scripts scripts
 
 # Configuration file : aims at making your variables suit your environment (local, docker, prod, etc)
 
-COPY docker_search.json /etc/oc/search.json
+COPY local_search.json /etc/oc/search.json
 
 # FROM golang
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 2b949f0..f32851b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,8 +2,13 @@ version: '3.4'
 
 services:
   oc-search:
+<<<<<<< HEAD
     image: oc-search:debugging
     container_name: oc-search
+=======
+    image: oc-search
+    # container_name: oc-search
+>>>>>>> ded5593 (clean Dockerfile and compose)
     ports: 
       - 8080:8080
     networks: