diff --git a/openstack-login/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
index ca590b8cc5c7f7d5b3686eab64f511cd343b9543..81dfa7ee9aa7431ed92aad950220c4610dac7bfc 100644
--- a/openstack-login/nodeimage.pkr.hcl
+++ b/openstack-login/nodeimage.pkr.hcl
@@ -40,6 +40,9 @@ build {
 
 <<<<<<< 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