diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb9310c78baaeca1d3fbcd611b4f1f223fdb512f..f6f32bad15da1ba30e1286e118ac105a5c1c2b8e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,7 +105,11 @@ pages:
       when: on_success  # Run if the source pipeline was successful
 # Deploy to GitLab Pages
 deploy_gitlab_pages:
+<<<<<<< HEAD
   stage: .post
+=======
+  stage: deploy to gitlab
+>>>>>>> a3a1079f334bf1bc818c8086baa6dba5942cbed0
   script:
     - mv $CI_PROJECT_DIR/public $CI_PROJECT_DIR/public  # Ensure the output is in the public folder
   rules: