diff --git a/indexer/msk.tf b/indexer/msk.tf
index 4a5f0e2..04e32bc 100644
--- a/indexer/msk.tf
+++ b/indexer/msk.tf
@@ -1,8 +1,14 @@
 resource "aws_msk_configuration" "main" {
+<<<<<<< HEAD
   // create_before_destroy=true requires us to use name whenever this resource needs replacement because the old 
   // resource not delete first. For now we only trigger replacement for new kafka versions, so use the kafka version in 
   // the name
   kafka_versions    = [local.kafka_version]
+=======
+  kafka_versions = [local.kafka_version]
+  // create_before_destroy=true forces a new name because the old resource not delete first. For now we only trigger 
+  // replacement for new kafka versions, so use the kafka version in the name
+>>>>>>> main
   name              = "${var.environment}-${var.indexers[var.region].name}-msk-configuration-${replace(local.kafka_version, ".", "-")}"
   server_properties = <<PROPERTIES
   auto.create.topics.enable=false
@@ -57,4 +63,4 @@ resource "aws_msk_cluster" "main" {
     arn      = aws_msk_configuration.main.arn
     revision = aws_msk_configuration.main.latest_revision
   }
-}
+}
\ No newline at end of file