Resolving Git Merge Conflicts Between Two Branches - Fix pnpm ERR! Cannot Find Module – Practical Steps-Git index.lock: Causes and Prevention

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