Resolving Git Merge Conflicts Between Two Branches - Edge Sync Troubleshooting: Passwords and Bookmarks-Fix pip Install Permission Error on macOS

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