Resolving Git Merge Conflicts Between Two Branches - How to Fix ERR_NAME_NOT_RESOLVED in Chrome-Cloudflare Origin Certificate Expired: Renewal Steps

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.