Fix Python Dependency Conflicts After an Update - Fix Bluetooth Pairing in Windows 11-Handling Git Merge Conflicts in Lockfiles

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