Fix Git Merge Conflicts When Stash Changes Are Involved - Docker Container Exits Immediately on Mac: Fixes-Docker Compose Port Already Allocated: Fixes & Checks

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