Resolving Git Merge Conflicts After Cherry-Pick - Fix Docker Compose 'port 8080 already allocated' Error-Fix Frozen Windows 11 Update Assistant

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