diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 195343f..c6e84ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,12 +24,8 @@ Build:
       - public
   only:
     - main
-<<<<<<< HEAD
 
 
-=======
->>>>>>> f07b1f2 (only build for changes made to main)
-
 Dockerize:
   stage: dockerize
   image:
@@ -42,8 +38,3 @@ Dockerize:
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:latest
   only:
     - main
-<<<<<<< HEAD
-
-
-=======
->>>>>>> f07b1f2 (only build for changes made to main)