diff --git a/qa/tf/ci/smoketest/main.tf b/qa/tf/ci/smoketest/main.tf
index 6baed6889..15076a4c0 100644
--- a/qa/tf/ci/smoketest/main.tf
+++ b/qa/tf/ci/smoketest/main.tf
@@ -10,7 +10,12 @@ module "ci-cluster" {
     branch = var.branch 
 }
 
+<<<<<<< HEAD
 resource "aws_vpc_peering_connection" "gauntlet-to-vpn" {
+=======
+resource "aws_vpc_peering_connection" "smoketest-to-vpn" {
+#  peer_vpc_id   = aws_vpc.bar.id
+>>>>>>> 574be963ec450073b549be1c854a18d4b9632720
   vpc_id        = module.ci-cluster.vpc_id
   peer_vpc_id   = "vpc-0cb7cf76f2079aa0e"
   auto_accept = true
diff --git a/qa/tf/ci/smoketest/outputs.tf b/qa/tf/ci/smoketest/outputs.tf
index 711c6ae13..74085b7c4 100644
--- a/qa/tf/ci/smoketest/outputs.tf
+++ b/qa/tf/ci/smoketest/outputs.tf
@@ -9,6 +9,11 @@ output "data_node_ips" {
 }
 
 output "vpc_id" {
+<<<<<<< HEAD
   description = "ID of the gauntlet VPC"
   value = module.samsung-cluster.vpc_id
+=======
+  description = "ID of the VPC"
+  value = module.ci-cluster.vpc_id
+>>>>>>> 574be963ec450073b549be1c854a18d4b9632720
 }
\ No newline at end of file