Fix 'Port Already Allocated' Error in Docker Compose on Mac - Resolving Git Merge Conflicts After Cherry-Pick-Git Merge Abort Fails: How to Recover

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