i keep getting a merge conflict when trying to git pull from the new updated 4bit-plugin dev branch

[0xYc0d0ne]

From https://github.com/0cc4m/KoboldAI

• branch HEAD -> FETCH_HEAD
  Auto-merging README.md
  CONFLICT (content): Merge conflict in README.md
  Auto-merging commandline.bat
  CONFLICT (modify/delete): docs/gptq-whl-links.html deleted in HEAD and modified in e1127b9. Version e1127b9 of docs/gptq-whl-links.html left in tree.
  Auto-merging environments/huggingface.yml
  CONFLICT (content): Merge conflict in environments/huggingface.yml
  CONFLICT (modify/delete): modeling/inference_models/hf_torch_4bit.py deleted in HEAD and modified in e1127b9. Version e1127b9 of modeling/inference_models/hf_torch_4bit.py left in tree.
  Auto-merging play.bat
  Auto-merging update-koboldai.bat
  Automatic merge failed; fix conflicts and then commit the result.

im also getting an error when trying to run the install requirements.bat

"
Empty environment created at prefix: B:\python
info libmamba ****************** Backtrace Start ******************
debug libmamba Loading configuration
trace libmamba Compute configurable 'create_base'
trace libmamba Compute configurable 'no_env'
trace libmamba Compute configurable 'no_rc'
trace libmamba Compute configurable 'rc_files'
trace libmamba Compute configurable 'root_prefix'
trace libmamba Get RC files configuration from locations up to HomeDir
trace libmamba Configuration not found at 'C:\Users\alpha.mambarc'
trace libmamba Configuration not found at 'C:\Users\alpha.condarc'
trace libmamba Configuration not found at 'C:\Users\alpha.conda\condarc.d'
trace libmamba Configuration not found at 'C:\Users\alpha.conda\condarc'
trace libmamba Configuration not found at 'C:\Users\alpha.conda.condarc'
trace libmamba Configuration not found at 'B:\python.mambarc'
trace libmamba Configuration not found at 'B:\python\condarc.d'
trace libmamba Configuration not found at 'B:\python\condarc'
trace libmamba Configuration not found at 'B:\python.condarc'
trace libmamba Configuration not found at 'C:\ProgramData\conda.mambarc'
trace libmamba Configuration not found at 'C:\ProgramData\conda\condarc.d'
trace libmamba Configuration not found at 'C:\ProgramData\conda\condarc'
trace libmamba Configuration not found at 'C:\ProgramData\conda.condarc'
trace libmamba Update configurable 'no_env'
trace libmamba Compute configurable 'file_specs'
error libmamba YAML error in spec file 'C:\KoboldAI\environments\huggingface.yml'
critical libmamba yaml-cpp: error at line 54, column 2: unexpected character in block scalar
info libmamba ****************** Backtrace End ********************

                                       __
      __  ______ ___  ____ _____ ___  / /_  ____ _
     / / / / __ `__ \/ __ `/ __ `__ \/ __ \/ __ `/
    / /_/ / / / / / / /_/ / / / / / / /_/ / /_/ /
   / .___/_/ /_/ /_/\__,_/_/ /_/ /_/_.___/\__,_/
  /_/

Collect information..
Cleaning index cache..
Cleaning lock files..
Cleaning tarballs..
Cleaning packages..
The system cannot find the file specified.
Press any key to continue . . ."

[0cc4m]

The branch was for a PR into united (henk717#367), which was merged now. You can use united directly now for GPTQ. The exllama module is still on this repo, in the exllama branch.