Fix Git Merge Conflicts When Stash Changes Are Involved - Fix Docker Compose Port Allocation Errors-Docker Container Cannot Find Network on Restart

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