Resolving Git Merge Conflicts After Cherry-Pick - Troubleshooting Nginx Upstream Connection Refused Port 80-Poetry Lock File Conflict Resolution Guide

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