diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2aefaaf..763fb3d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 stages:
   - 'Install'
   - 'Test'
@@ -29,6 +30,9 @@ test:
   image: node:18.13.0
 =======
 test:unit:
+=======
+test:
+>>>>>>> 981bc22 (rename test job)
   stage: test
 >>>>>>> 5a98ad5 (fix stage)
   script: