Resolving Git Merge Conflicts After Cherry-Pick - Resolve Cloudflare 521 via SSL Settings-Docker Compose Ignoring Default Environment Variable

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