diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d07f60ca43a964c96ab00b71cf731f9a22195222..35de6198ce9732f08a242740f1f98555113a91e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -115,25 +115,6 @@ variables:
   tags:
     - mage02
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-.production:
-  except:
-    - ^.*beta.*$
-    - ^.*-rc.*$
-  only:
-    - tags@ghsc/geomag/geomag-algorithms
-    - production@ghsc/geomag/geomag-algorithms
-  when: manual
-
-=======
->>>>>>> remove production template
-.staging:
-  only:
-    - master@ghsc/geomag/geomag-algorithms
-    - tags@ghsc/geomag/geomag-algorithms
->>>>>>> add production template
 ## --------------------------------------------------
 # Test Stage
 ## --------------------------------------------------
@@ -190,6 +171,7 @@ Deploy Mage01:
 Deploy Mage02:
   extends:
     - .deploy
+    - .production
     - .mage
     - .mage02
   variables: