Two branches change the same lines incompatibly. Their merge reports a conflict. What should the developer do?

1. Assume Git has chosen the newest text
2. Delete the repository and recreate it
3. Resolve the competing content and complete the merge
4. Force-push the default branch immediately