diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5694ce525f3fdbc648966e19b321c8eac4743c9d..9d1460586fa950cd6d7195fa44d0f8353e68fe1a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -222,11 +222,7 @@ build_test-clang-14:
       junit:
         - ${CI_PROJECT_DIR}/build/test_outputs/junit*.xml
     paths:
-<<<<<<< .gitlab-ci.yml
       - ${CI_PROJECT_DIR}/build/build_examples/example_outputs #python tests/examples need this
-=======
-      - ${CI_PROJECT_DIR}/build/build_examples/example_outputs/radio_em_shower_outputs #python examples need this
->>>>>>> .gitlab-ci.yml
       - ${CI_PROJECT_DIR}/build/test_outputs/junit*.xml
       - ${CI_PROJECT_DIR}/build/CMakeCache.txt #python tests need this
       - ${CI_PROJECT_DIR}/build/bin #python tests need this