diff --git a/it-windows-base/ports.tf b/it-windows-base/ports.tf
index 23e69de..6b9aee2 100644
--- a/it-windows-base/ports.tf
+++ b/it-windows-base/ports.tf
@@ -25,12 +25,7 @@ locals {
   n_encase      = ["148.129.121.72/32"]
   n_riverbed    = ["172.24.100.107/32"]
   n_hpsa        = ["172.24.100.141/32", "172.24.100.154/32", "172.24.100.165/32"]
-<<<<<<< HEAD
   n_hpom        = ["172.24.105.24/32"]
-=======
-  n_hpomtcp     = ["172.24.105.24/32"]
-  n_hpomudp     = ["172.24.105.24/32"]
->>>>>>> d318bc5695d0fc41f1e6236aef2784d305f400ed
   source_groups = ["all", "external"]
   name          = var.name
   ports = [
@@ -44,8 +39,8 @@ locals {
     [5986, 5986, "tcp", "WinRM-https", local.n_ansible, ["external"]],
     [27401, 27401, "tcp", "TransactionAgent", local.n_riverbed, ["external"]],
     [1002, 1002, "tcp", "HPSA", local.n_hpsa, ["external"]],
-    [383, 383, "tcp", HPOM, local.n_hpom, ["external"]],
-    [383, 383, "udp", HPOM, local.n_hpom, ["external"]],
+    [383, 383, "tcp", "HPOM", local.n_hpom, ["external"]],
+    [383, 383, "udp", "HPOM", local.n_hpom, ["external"]],
   ]
 
   # these are ignored