diff --git a/security_groups.tf b/security_groups.tf
index e8449a3..e62c641 100644
--- a/security_groups.tf
+++ b/security_groups.tf
@@ -10,11 +10,7 @@ resource "aws_security_group" "additional_eks_cluster_sg" {
   tags = merge(
     local.base_tags,
     var.tags,
-<<<<<<< HEAD
     { "Name" = local.additional_eks_cluster_sg_name },
-=======
-    tomap({ "Name" = local.additional_eks_cluster_sg_name }),
->>>>>>> ddd6d64 (align with upstream)
   )
 
   vpc_id = data.aws_vpc.eks_vpc.id