Two engineers changed the same Terraform file and Git reports a conflict. How do you resolve it?

Core Summary

Resolve the text conflict, then prove the result is actually correct with terraform validate and a plan. A clean Git merge only means the file parses in a human's head, it says nothing about whether the merged config destroys a database.