Resolving Git Merge Conflicts After Cherry-Pick - Fix npm ENOWENT Package.json Not Found on Mac-Fix DNS Probe Finished NXDOMAIN After Changing DNS

Final checklist
- Confirm that the same symptom is gone after a restart or refresh.
- Keep the smallest working change and undo temporary diagnostic settings.