Fix Git Merge Conflicts with Deleted Files - Fix Docker Compose Port Already Allocated on Linux-Fix Missing Taskbar Icons in Windows

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