Resolving Git Merge Conflicts Between Two Branches - How to Resolve pnpm Unsupported URL Type-Windows Update Error 0x80070002 Clean Boot Fix

Result check
- Keep one change per test run so you know which step helped.
- Undo temporary changes after the issue is confirmed.