Fix Edge Sync Not Working with Family Safety - Fix Git Merge Conflicts When Stash Changes Are Involved-DNS Probe Finished NXDOMAIN Fix Guide

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