diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c22b97e7bafa4729591c2668b12a6057ae0ea56..732e9eaf0c6b869f94b59f327031135bd158ecfa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,10 @@ helloworld:
   script:
     - echo "hello, world"
 <<<<<<< HEAD
+<<<<<<< HEAD
+    - echo "bonjour, monde"
+=======
+>>>>>>> c424feb... Clean .gitlab-ci.yml
     - echo "bonjour, monde"
 =======
 >>>>>>> c424feb... Clean .gitlab-ci.yml