diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aaa5bdf..b22903d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,58 +1,28 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 67d9de5 (add stages)
 stages:
   - 'Install'
   - 'Test'
   - 'Deploy'
 
-<<<<<<< HEAD
 before_script:
   ## chmod is unfortunately currently mandatory : https://github.com/nodejs/docker-node/issues/661
   - npm install -g yarn@1.22.19 && chmod +x /usr/local/lib/node_modules/yarn/bin/yarn.js
 
-=======
->>>>>>> 5a98ad5 (fix stage)
 install:
   stage: Install
   image: node:18.13.0
-<<<<<<< HEAD
-=======
-install:
-  stage: Install
->>>>>>> 67d9de5 (add stages)
-=======
->>>>>>> c9f4fa7 (add node version)
   script:
-    - npm run install
+    - yarn install
   artifacts:
     name: 'artifacts'
     untracked: true
     expire_in: 30 mins
     paths:
-      - .npm/
+      - .yarn/
       - node_modules/
 
-<<<<<<< HEAD
 test:
   stage: Test
-<<<<<<< HEAD
-<<<<<<< HEAD
   image: node:18.13.0
-=======
-test:unit:
-=======
-test:
->>>>>>> 981bc22 (rename test job)
-  stage: test
->>>>>>> 5a98ad5 (fix stage)
-=======
->>>>>>> 67d9de5 (add stages)
-=======
-  image: node:18.13.0
->>>>>>> c9f4fa7 (add node version)
   script:
     - yarn test:unit
   dependencies: