diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f4e443c105b15833780f62568ab72e7523229f50..5146e2011a5d40577ada9cc6907b9fd7c32e037a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,6 +115,7 @@ variables:
   tags:
     - mage02
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 .production:
@@ -126,6 +127,8 @@ variables:
     - production@ghsc/geomag/geomag-algorithms
   when: manual
 
+=======
+>>>>>>> remove production template
 .staging:
   only:
     - master@ghsc/geomag/geomag-algorithms