diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5cc67e82feef9ada2f0daaa7d50fdb3d8a375cbb..c4d3d5ba6246b038763fc27a2199497d8682d109 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,6 @@
 stages:
   - check
-<<<<<<< HEAD
   - test
-=======
- # - test
-  - automated_test
->>>>>>> test only manuanl automated test
 
 .before_script: &before_script
   before_script:
@@ -23,6 +18,7 @@ stages:
     - python3 -m venv .venv --clear
     - source .venv/bin/activate
     - python3 -m pip install --upgrade pip setuptools wheel
+
 checks:
   stage: check
   only: [merge_requests]
@@ -41,22 +37,20 @@ checks:
     #  Pass list of modified files to pre-commit so that it only checks them
     - echo $FILES | xargs pre-commit run --color=always --files
 
-
-#pytest:
-#  stage: test
-#  only: [merge_requests]
-#  <<: *before_script
-#  script:
-#    - export LANG=C  # Hopefully detect anything relying on locale
-  #  - python3 -m pip install ".[test]"
-  #  - python3 -m pytest --color yes --verbose --cov=cal_tools --cov=xfel_calibrate
+pytest:
+  stage: test
+  only: [merge_requests]
+  <<: *before_script
+  script:
+    - export LANG=C  # Hopefully detect anything relying on locale
+    - python3 -m pip install ".[test]"
+    - python3 -m pytest --color yes --verbose --cov=cal_tools --cov=xfel_calibrate
 #  Nope... https://docs.gitlab.com/12.10/ee/user/project/merge_requests/test_coverage_visualization.html#enabling-the-feature
 #    - coverage xml
 #  artifacts:
 #    reports:
 #      cobertura: coverage.xml
 
-<<<<<<< HEAD
 cython-editable-install-test:
   stage: test
   only: [merge_requests]
@@ -64,26 +58,3 @@ cython-editable-install-test:
   script:
     - python3 -m pip install -e ".[test]"
     - python3 -m pytest --color yes --verbose ./tests/test_cythonalgs.py 
-=======
-#cython-editable-install-test:
-#  stage: test
-#  only: [merge_requests]
-#  <<: *before_script
-#  script:
-    #- python3 -m pip install -e ".[test]"
-   # - python3 -m pytest --color yes --verbose ./tests/test_agipdalgs.py
-
-pytest:
-  variables:
-    REFERENCE_FOLDER: "/gpfs/exfel/data/scratch/xcaltst/test/"
-    OUT_FOLDER: "/gpfs/exfel/data/scratch/xcaltst/test/"
-  stage: automated_test
-  only: [merge_requests]
-  when: manual
-  allow_failure: true
-  <<: *before_script
-  script:
-    - export LANG=C  # Hopefully detect anything relying on locale
-    - python3 -m pip install ".[test]"
-    - python3 -m pytest ./tests/test_reference_runs --color yes --verbose --release-test --reference-folder $REFERENCE_FOLDER --out-folder $OUT_FOLDER
->>>>>>> test only manuanl automated test