Fix Windows 11 Installation Assistant Stuck at 99% - Git Merge Conflict Same Line: Step-by-Step Fix-Resolve Git Non Fast-Forward Push Rejection

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