Resolving Git Merge Conflicts After Cherry-Pick - Step-by-Step Fix for Windows Update Error 0x800f081f-Docker Network Missing After Container Restart

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