Git Merge vs Rebase Conflicts: Key Differences and Fixes - Git Merge Conflict Auto Resolve Not Working: Common Fixes-Fix ERR_NAME_NOT_RESOLVED in Chrome Safe Mode

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