Resolving Git Merge Conflicts Between Two Branches - Fix Nginx 502 Bad Gateway in Docker Containers-DNS Probe Finished NXDOMAIN with Custom DNS – How to Fix

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