How to Resolve Git Merge Conflicts on the Same Line - Fix pnpm ERR_PNPM_OUTDATED_LOCKFILE Lockfile Error-Fix Virtual Environment Not Activating in Terminal

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