Fix Git Merge Conflicts When Stash Changes Are Involved - Fix Edge Sync by Clearing Cache-Fix Docker Network Missing After Reboot

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