diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d701e69..6ca5373 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,11 +7,7 @@ job:
     - docker stop esg-report-backend
     - docker rm esg-report-backend
     - docker build -t esg-report-backend .
-<<<<<<< HEAD
-    - docker run -d --restart=always 51002:51002 --name esg-report-backend esg-report-backend
-=======
     - docker run -d --restart=always -p 51002:51002 --name esg-report-backend esg-report-backend
->>>>>>> e858230517deda24eda1b99f6dd8ab321fbb4814
   only:
     - master
   tags: