Git Merge Conflict Auto Resolve Not Working: Common Fixes - Nginx Upstream Directive Test Failure Fix-DNS_PROBE_FINISHED_NXDOMAIN: ipconfig flushdns Not Working

Final checklist
- Confirm that the same symptom is gone after a restart or refresh.
- Keep the smallest working change and undo temporary diagnostic settings.