Resolving Git Merge Conflicts Between Two Branches - Install Cloudflare SSL Certificate on Nginx-Fix DNS Probe Finished NXDOMAIN After Changing DNS

Prepare
Execute
Validate
Document
Operational follow-up
- Record the exact option, command, or setting that changed the result.
- Keep a rollback note if the workflow affects shared files or team settings.