diff --git a/infrastructure/rds.tf b/infrastructure/rds.tf
index 3a854e0..396e5e0 100644
--- a/infrastructure/rds.tf
+++ b/infrastructure/rds.tf
@@ -18,11 +18,5 @@ resource "aws_db_instance" "rds_instance" {
   publicly_accessible    = true
   skip_final_snapshot    = true
   vpc_security_group_ids = [aws_security_group.rds_security_group.id]
-<<<<<<< Updated upstream
 }
-=======
-  db_subnet_group_name   = aws_db_subnet_group.rds_subnet_group.name
 
-}
-
->>>>>>> Stashed changes