Resolving Git Merge Conflicts After Cherry-Pick - Port Already Allocated in Docker Compose-How to Fix Nginx 502 Bad Gateway in Docker

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