Resolving Git Merge Conflicts Between Two Branches - Conda Environment Dependency Troubleshooting-Docker Container Exits Immediately on Linux: Fixes

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