Resolving Git Merge Conflicts After Cherry-Pick - How to Fix Chrome Extensions Not Loading-Fix 'Your Credentials Did Not Work' in Remote Desktop

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