Fix npm run build Failed After Git Pull - package-lock.json Conflict Guide-Mac Git: Dealing with Existing Remote Origin

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