Resolving Git Merge Conflicts After Cherry-Pick - Nginx Config Test Fails in Docker Container-Resolve Python UnicodeDecodeError for Non-UTF-8 Files

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