diff --git a/openstack-login/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
index dad64e131e2bdac4337a212f68329105d16a4cee..cb9e4acb4c40be703882486ff68927252de8bebd 100644
--- a/openstack-login/nodeimage.pkr.hcl
+++ b/openstack-login/nodeimage.pkr.hcl
@@ -38,6 +38,9 @@ build {
 <<<<<<< 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
   provisioner "ansible" {
     use_proxy     = false