diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b87d3c..2c66305 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,7 @@ test-job:
   script:
     - cargo test
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 
 e2e-job:
@@ -17,3 +18,5 @@ e2e-job:
     - bash /usr/bin/prepare.sh $CI_COMMIT_BRANCH && bash /opt/husk/husk-milter/e2e-tests/runner.sh
 
 >>>>>>> 118c12c (Update .gitlab-ci.yml file)
+=======
+>>>>>>> 8d86f9d (Remove the e2e job from ci/cd until it is fixed)