Fixing Unresolved Paths After Git Merge Conflict Rebase - Fix pnpm ERR_PNPM_OUTDATED_LOCKFILE Lockfile Error-How to Fix Edge Sync for Passwords and Bookmarks

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