A lot of new errors

[transitgrave]

I'm launching SD with arguement --update-all-extensions and receiving the following errors on launch. The extension will no longer load in the webUI.

error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm '
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Couldn't perform 'git pull' on repository in 'C:\SD2023\stable-diffusion-webui\extensions\sd-webui-text2video':

Error loading script: api_t2v.py
Traceback (most recent call last):
File "C:\SD2023\stable-diffusion-webui\modules\scripts.py", line 257, in load_scripts
script_module = script_loading.load_module(scriptfile.path)
File "C:\SD2023\stable-diffusion-webui\modules\script_loading.py", line 11, in load_module
module_spec.loader.exec_module(module)
File "", line 883, in exec_module
File "", line 241, in _call_with_frames_removed
File "C:\SD2023\stable-diffusion-webui\extensions\sd-webui-text2video\scripts\api_t2v.py", line 34, in
from t2v_helpers.render import run
File "C:\SD2023\stable-diffusion-webui/extensions/sd-webui-text2video/scripts\t2v_helpers\render.py", line 2, in
from modelscope.process_modelscope import process_modelscope
File "C:\SD2023\stable-diffusion-webui/extensions/sd-webui-text2video/scripts\modelscope\process_modelscope.py", line 44
<<<<<<< Updated upstream
IndentationError: expected an indented block after 'except' statement on line 43

Error loading script: text2vid.py
Traceback (most recent call last):
File "C:\SD2023\stable-diffusion-webui\modules\scripts.py", line 257, in load_scripts
script_module = script_loading.load_module(scriptfile.path)
File "C:\SD2023\stable-diffusion-webui\modules\script_loading.py", line 11, in load_module
module_spec.loader.exec_module(module)
File "", line 883, in exec_module
File "", line 241, in _call_with_frames_removed
File "C:\SD2023\stable-diffusion-webui\extensions\sd-webui-text2video\scripts\text2vid.py", line 17, in
from t2v_helpers.render import run
File "C:\SD2023\stable-diffusion-webui/extensions/sd-webui-text2video/scripts\t2v_helpers\render.py", line 2, in
from modelscope.process_modelscope import process_modelscope
File "C:\SD2023\stable-diffusion-webui/extensions/sd-webui-text2video/scripts\modelscope\process_modelscope.py", line 44
<<<<<<< Updated upstream
IndentationError: expected an indented block after 'except' statement on line 43

any help would be appreciated, thank you.

[transitgrave]

Update - I deleted the txt2vid extensions folder from \stable-diffusion-webui\extensions\ and re-installed the extension and relaunched. Seemed to clear up the errors and the extension is available and working again. Leaving this up in case anyone else encounters similar error messages. :)