Git Merge Conflict: Keep Both Files Instead of One - Cloudflare Origin Certificate Installation Guide-How to Fix VSCode IntelliSense for JavaScript

Likely symptom
Likely cause
Safe rollback
Verification route
- Repeat the original action, not only a simplified test case.
- Restart the app or reload the service after configuration changes.