Fix Cloudflare 522 Error with Nginx Configuration - Viewing the Diff in a Git Merge Conflict-How to See What Changed During a Git Merge Conflict

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