diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b418e2b2342e55d63d4ba909ee9ca65ddf2e2a31..2cfe47bb0dde1a3bae7d471b70553c8cd1472c33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,6 @@
 stages:  
   - build
-<<<<<<< HEAD
   - test
-=======
-  - test:scripts
-  - test:monitoring
-  - test:inputs
->>>>>>> 7b4334bb2ab788e29ddde9098efcba96c0447112
     
 build:tests:
   stage: build