diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 059772e..de4b5b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,4 +23,7 @@ build:
     - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
   except:
     - master
+<<<<<<< HEAD
 
+=======
+>>>>>>> c80658da6110e2c9095cdbd249c5583509c16a7a