Resolving Git Merge Conflicts Between Two Branches - Cloudflare Full Strict Mixed Content Fix-Troubleshooting VS Code Git Change Detection

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