diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d95bb50..195343f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,8 +24,11 @@ Build:
       - public
   only:
     - main
+<<<<<<< HEAD
 
 
+=======
+>>>>>>> f07b1f2 (only build for changes made to main)
 
 Dockerize:
   stage: dockerize
@@ -39,5 +42,8 @@ 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)