Fix 'fatal: refusing to merge unrelated histories' in Bitbucket - Resolving Conflicts When Merging Git Branches-Docker Nginx 502 Bad Gateway Fix

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