Fix 'fatal: refusing to merge unrelated histories' in Bitbucket - How to Fix package-lock.json Merge Conflicts-Fixing Python Dependency Conflicts in setup.py

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