Two branches modify the same rule set and a merge conflict occurs. What is the proper response?

1. Resolve the conflicting intent and test the resulting combined behavior
2. Delete the whole extension to avoid the conflict
3. Accept every incoming line without understanding either change
4. Disable Git permanently