diff --git a/openstack-login/nodeimage.pkr.hcl b/openstack-login/nodeimage.pkr.hcl
index cb9e4acb4c40be703882486ff68927252de8bebd..ca590b8cc5c7f7d5b3686eab64f511cd343b9543 100644
--- a/openstack-login/nodeimage.pkr.hcl
+++ b/openstack-login/nodeimage.pkr.hcl
@@ -39,6 +39,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
 =======
 >>>>>>> 327768b... Avoid building base instead use base img as src img:openstack-compute/nodeimage.pkr.hcl