diff --git a/openstack-login/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
index 81dfa7ee9aa7431ed92aad950220c4610dac7bfc..057cc3ec282a945308eb43d2f430a926b64522af 100644
--- a/openstack-login/nodeimage.pkr.hcl
+++ b/openstack-login/nodeimage.pkr.hcl
@@ -35,19 +35,6 @@ source "openstack" "image" {
 
 build {
   sources = ["source.openstack.image"]
-<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
-=======
-
-<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
-<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
-<<<<<<< HEAD:openstack-login/nodeimage.pkr.hcl
->>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
-=======
->>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
-=======
->>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
-=======
->>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl
   provisioner "ansible" {
     use_proxy     = false
     user          = var.ssh_username