Won't let me update

not used it in ages, I couldn't get SDXL working reliably in Automatic1111, herd here was greener pastures. I'm trying to update so I can install the custom nodes manager but it won't let me:

D:\Aiimagegeneration\comfyai\ComfyUI_windows_portable_nvidia_cu118_or_cpu\ComfyUI_windows_portable\update>..\python_embeded\python.exe .\update.py ..\ComfyUI\
stashing current changes
nothing to stash
creating backup branch: backup_branch_2023-08-01_00_22_30
checking out master branch
pulling latest changes
Traceback (most recent call last):
File "D:\Aiimagegeneration\comfyai\ComfyUI_windows_portable_nvidia_cu118_or_cpu\ComfyUI_windows_portable\update\update.py", line 62, in
pull(repo)
File "D:\Aiimagegeneration\comfyai\ComfyUI_windows_portable_nvidia_cu118_or_cpu\ComfyUI_windows_portable\update\update.py", line 16, in pull
repo.checkout_tree(repo.get(remote_master_id))
File "D:\Aiimagegeneration\comfyai\ComfyUI_windows_portable_nvidia_cu118_or_cpu\ComfyUI_windows_portable\python_embeded\lib\site-packages\pygit2\repository.py", line 362, in checkout_tree
payload.check_error(err)
File "D:\Aiimagegeneration\comfyai\ComfyUI_windows_portable_nvidia_cu118_or_cpu\ComfyUI_windows_portable\python_embeded\lib\site-packages\pygit2\callbacks.py", line 98, in check_error
check_error(error_code)
File "D:\Aiimagegeneration\comfyai\ComfyUI_windows_portable_nvidia_cu118_or_cpu\ComfyUI_windows_portable\python_embeded\lib\site-packages\pygit2\errors.py", line 65, in check_error
raise GitError(message)
_pygit2.GitError: 20 conflicts prevent checkout

D:\Aiimagegeneration\comfyai\ComfyUI_windows_portable_nvidia_cu118_or_cpu\ComfyUI_windows_portable\update>pause
Press any key to continue . . .

please if any one knows how to fix this let me know.