diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e438efc905ffd61ad6cc1dfa385ce5955a84e040..49f5dbec2f0f4e1091664f15ce22d4410b0ba450 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
-  STACKNAME: CICD_reporef$CI_COMMIT_REF_NAME
+  STACKNAME: CICD_aciab_f$CI_COMMIT_REF_NAME
   NECTAR_ALLOCATION: HPCCICD
   ANSIBLE_HOST_KEY_CHECKING: "False"
   DEFAULT_PATH: "CICD"
diff --git a/CICD/heat/gc_HOT.yaml b/CICD/heat/gc_HOT.yaml
index a1def24871ff535f13ad05c66720205dab00806a..ed52ead116ca38a78931245166947eb972d6aea2 100644
--- a/CICD/heat/gc_HOT.yaml
+++ b/CICD/heat/gc_HOT.yaml
@@ -13,11 +13,7 @@ parameters:
     type: string
     label: Image ID
     description: Centos Image
-<<<<<<< HEAD
-    default: c47c3acb-9657-4243-9e14-e6c676157e3b #with Networkmanager
-=======
     default: c47c3acb-9657-4243-9e14-e6c676157e3b #with NetworkManager
->>>>>>> origin/devel
   ssh_key:
     type: string
     default: gc_key