Resolving Git Merge Conflicts Between Two Branches - Fix VSCode Terminal Error spawn ENOENT-Quick Fixes for ERR_CONNECTION_RESET in Chrome Mobile

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