Fix Missing Edge Sync Option in Settings - Troubleshooting npm Permission Denied in CI Environments-Keep Both Files After Git Merge Conflict

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