Git Merge Conflict Auto Resolve Not Working: Common Fixes - Fix Edge Sync Not Working After Update-How to Resolve npm package.json Not Found in Subdirectory

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