diff --git a/locals.tf b/locals.tf
index 67cabf9..4e1af86 100644
--- a/locals.tf
+++ b/locals.tf
@@ -39,14 +39,11 @@ nginx:
 astronomer:
   houston:
     config:
-<<<<<<< HEAD
     %{if var.smtp_uri != ""}
         email:
           enabled: true
           smtpUrl: ${var.smtp_uri}
     %{endif}
-=======
->>>>>>> master
         helm:
            affinity:
              nodeAffinity: