diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-srn/eks-keycloak/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-srn/eks-keycloak/terragrunt.hcl
index 248432dd..48028f6f 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-srn/eks-keycloak/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-srn/eks-keycloak/terragrunt.hcl
@@ -42,7 +42,11 @@ dependency "eks_postgresql" {
   config_path                             = "../eks-postgresql"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
+<<<<<<< HEAD
     internal_endpoint = {
+=======
+    internal_endpoint = { 
+>>>>>>> 4d9a294 (deleted old cluster platform-eng-eks-test and created new cluster platform-eng-eks-srn)
       url = "mock-internal-endpoint-url"
     }
   }
@@ -76,10 +80,17 @@ inputs = {
   telemetry_namespace    = include.root.inputs.telemetry_namespace
 
   # Database configuration
+<<<<<<< HEAD
   db_host     = dependency.eks_postgresql.outputs.internal_endpoint.url
   db_name     = include.root.inputs.postgresql_database
   db_password = include.root.inputs.postgresql_password
   db_user     = include.root.inputs.postgresql_username
+=======
+  db_host = dependency.eks_postgresql.outputs.internal_endpoint.url
+  db_name = include.root.inputs.postgresql_database
+  db_password = include.root.inputs.postgresql_password
+  db_user = include.root.inputs.postgresql_username
+>>>>>>> 4d9a294 (deleted old cluster platform-eng-eks-test and created new cluster platform-eng-eks-srn)
 
   # Project information
   project_name = include.root.inputs.project_name
diff --git a/lab/development/us-gov-east-1/vpc/platform-eng-eks-srn/eks-tempo/terragrunt.hcl b/lab/development/us-gov-east-1/vpc/platform-eng-eks-srn/eks-tempo/terragrunt.hcl
index e1b17d6a..bca349f8 100644
--- a/lab/development/us-gov-east-1/vpc/platform-eng-eks-srn/eks-tempo/terragrunt.hcl
+++ b/lab/development/us-gov-east-1/vpc/platform-eng-eks-srn/eks-tempo/terragrunt.hcl
@@ -25,9 +25,13 @@ dependency "eks-prometheus" {
   config_path                             = "../eks-prometheus"
   mock_outputs_allowed_terraform_commands = ["init", "plan", "validate", "destroy"]
   mock_outputs = {
+<<<<<<< HEAD
     prometheus_svc       = "prometheus-server"
     prometheus_namespace = "prometheus"
     prometheus_port      = 80
+=======
+    prometheus_namespace = "prometheus"
+>>>>>>> 4d9a294 (deleted old cluster platform-eng-eks-test and created new cluster platform-eng-eks-srn)
     prometheus_server_internal_endpoint = {
       hostname    = "prometheus-server.prometheus.svc.cluster.local"
       port_number = 9090
@@ -39,7 +43,13 @@ dependency "eks-prometheus" {
 dependencies {
   paths = [
     "../eks",
+<<<<<<< HEAD
+    "../eks-dns",
+=======
+    "../eks-config",
     "../eks-dns",
+    "../eks-karpenter",
+>>>>>>> 4d9a294 (deleted old cluster platform-eng-eks-test and created new cluster platform-eng-eks-srn)
     "../eks-prometheus"
   ]
 }
@@ -55,7 +65,10 @@ inputs = {
   oidc_provider_arn = dependency.eks.outputs.oidc_provider_arn
 
   # Prometheus Configuration
+<<<<<<< HEAD
   prometheus_svc       = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.hostname
+=======
+>>>>>>> 4d9a294 (deleted old cluster platform-eng-eks-test and created new cluster platform-eng-eks-srn)
   prometheus_namespace = dependency.eks-prometheus.outputs.prometheus_namespace
   prometheus_port      = dependency.eks-prometheus.outputs.prometheus_server_internal_endpoint.port_number
 
@@ -63,4 +76,8 @@ inputs = {
   tempo_chart_version = include.root.inputs.tempo_chart_version
   tempo_tag           = include.root.inputs.tempo_tag
   namespace           = include.root.inputs.namespaces["tempo"]
+<<<<<<< HEAD
+=======
+
+>>>>>>> 4d9a294 (deleted old cluster platform-eng-eks-test and created new cluster platform-eng-eks-srn)
 }