Fix Git Merge Conflicts When Stash Changes Are Involved - Resolve Docker MySQL Port Conflict-Fixing pnpm EINTEGRITY Integrity Check Failures

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