diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c66305..367b65a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,17 +6,3 @@ test-job:
   image: localhost:5000/huskbuilder:latest
   script:
     - cargo test
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-
-e2e-job:
-  stage: e2e
-  image: localhost:5000/mta:latest
-  script:
-    - echo "new"
-    - 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)