Fix Nginx Upstream Connection Refused in Docker - Resolving Same-Line Git Merge Conflicts-Troubleshooting Git Merge Permission Errors

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.