diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 732e9eaf0c6b869f94b59f327031135bd158ecfa..1ec33304d4d596b342b6bc8e4ec11119c62b4638 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,12 +3,4 @@ helloworld:
     - shell, specific
   script:
     - echo "hello, world"
-<<<<<<< HEAD
-<<<<<<< HEAD
-    - echo "bonjour, monde"
-=======
->>>>>>> c424feb... Clean .gitlab-ci.yml
-    - echo "bonjour, monde"
-=======
->>>>>>> c424feb... Clean .gitlab-ci.yml
     - echo "bonjour, monde"