Fix Git Merge Conflicts with Deleted Files - Fix npm Build Failure Step by Step-Resolve Git Pull Unrelated Histories Error

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