Resolving Git Merge Conflicts Between Two Branches - Fix Chrome ERR_CONNECTION_RESET: DNS Flush and More-Troubleshooting Cloudflare 522: Connection Timeout

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