Resolving Git Merge Conflicts After Cherry-Pick - Docker Desktop Engine Stopped Due to Antivirus-Fix Chrome Sync After Cache Clear

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