diff --git a/README.md b/README.md
index 91193d9a0..dc6b9b4c6 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,33 @@ Simplified start script: `automatic.sh`
       Python 3.10.6
       Torch: 2.0.0.dev20230118+cu118 CUDA: 11.8 cuDNN: 8700 GPU: NVIDIA GeForce RTX 3060 Arch: (8, 6)
 
+<<<<<<< HEAD
+- Stable Diffusion - https://github.com/CompVis/stable-diffusion, https://github.com/CompVis/taming-transformers
+- k-diffusion - https://github.com/crowsonkb/k-diffusion.git
+- GFPGAN - https://github.com/TencentARC/GFPGAN.git
+- CodeFormer - https://github.com/sczhou/CodeFormer
+- ESRGAN - https://github.com/xinntao/ESRGAN
+- SwinIR - https://github.com/JingyunLiang/SwinIR
+- Swin2SR - https://github.com/mv-lab/swin2sr
+- LDSR - https://github.com/Hafiidz/latent-diffusion
+- MiDaS - https://github.com/isl-org/MiDaS
+- Ideas for optimizations - https://github.com/basujindal/stable-diffusion
+- Cross Attention layer optimization - Doggettx - https://github.com/Doggettx/stable-diffusion, original idea for prompt editing.
+- Cross Attention layer optimization - InvokeAI, lstein - https://github.com/invoke-ai/InvokeAI (originally http://github.com/lstein/stable-diffusion)
+- Sub-quadratic Cross Attention layer optimization - Alex Birch (https://github.com/Birch-san/diffusers/pull/1), Amin Rezaei (https://github.com/AminRezaei0x443/memory-efficient-attention)
+- Textual Inversion - Rinon Gal - https://github.com/rinongal/textual_inversion (we're not using his code, but we are using his ideas).
+- Idea for SD upscale - https://github.com/jquesnelle/txt2imghd
+- Noise generation for outpainting mk2 - https://github.com/parlance-zz/g-diffuser-bot
+- CLIP interrogator idea and borrowing some code - https://github.com/pharmapsychotic/clip-interrogator
+- Idea for Composable Diffusion - https://github.com/energy-based-model/Compositional-Visual-Generation-with-Composable-Diffusion-Models-PyTorch
+- xformers - https://github.com/facebookresearch/xformers
+- DeepDanbooru - interrogator for anime diffusers https://github.com/KichangKim/DeepDanbooru
+- Sampling in float32 precision from a float16 UNet - marunine for the idea, Birch-san for the example Diffusers implementation (https://github.com/Birch-san/diffusers-play/tree/92feee6)
+- Instruct pix2pix - Tim Brooks (star), Aleksander Holynski (star), Alexei A. Efros (no star) - https://github.com/timothybrooks/instruct-pix2pix
+- Security advice - RyotaK
+- Initial Gradio script - posted on 4chan by an Anonymous user. Thank you Anonymous user.
+- (You)
+=======
 > ./automatic.sh install  
 
 - Install requirements and exit
@@ -78,3 +105,4 @@ See [Wiki](https://github.com/vladmandic/automatic/wiki) for **Torch** optimizat
 
 Everything is in [Wiki](https://github.com/vladmandic/automatic/wiki)  
 Except my current [TODO](TODO.md)  
+>>>>>>> 92b4fbe (update requirements)
diff --git a/requirements.txt b/requirements.txt
index 484d935d0..ffcc34d0d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,16 @@
 accelerate
 aenum
 basicsr
+<<<<<<< HEAD
 fonts
+=======
 blendmodes
 clean-fid
 einops
 fairscale
 fastapi
 filetype
+>>>>>>> 92b4fbe (update requirements)
 font-roboto
 fonts
 gfpgan
@@ -24,8 +27,8 @@ omegaconf
 opencv-contrib-python
 piexif
 Pillow
-psutil
-pytorch_lightning
+<<<<<<< HEAD
+pytorch_lightning==1.7.7
 realesrgan
 scikit-image>=0.19
 timm==0.4.12
@@ -34,6 +37,19 @@ torch
 einops
 jsonmerge
 clean-fid
+resize-right
+torchdiffeq
+kornia
+lark
+inflection
+GitPython
+torchsde
+safetensors
+=======
+>>>>>>> 92b4fbe (update requirements)
+psutil
+pytorch_lightning
+realesrgan
 requests
 resize-right
 safetensors
diff --git a/requirements_versions.txt b/requirements_versions.txt
index aada281c8..a7856d6fb 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -1,13 +1,32 @@
-accelerate==0.15.0
-basicsr==1.4.2
+<<<<<<< HEAD
 blendmodes==2022
-clean-fid==0.1.29
-einops==0.4.1
-fairscale==0.4.9
 transformers==4.25.1
 accelerate==0.12.0
 basicsr==1.4.2
 gfpgan==1.3.8
+gradio==3.16.2
+numpy==1.23.3
+Pillow==9.4.0
+realesrgan==0.3.0
+torch
+omegaconf==2.2.3
+pytorch_lightning==1.7.6
+scikit-image==0.19.2
+fonts
+font-roboto
+timm==0.6.7
+piexif==1.1.3
+einops==0.4.1
+jsonmerge==1.8.0
+=======
+accelerate==0.15.0
+basicsr==1.4.2
+blendmodes==2022
+>>>>>>> 92b4fbe (update requirements)
+clean-fid==0.1.29
+einops==0.4.1
+fairscale==0.4.9
+gfpgan==1.3.8
 GitPython==3.1.27
 gradio==3.16.2
 httpcore<=0.15
@@ -26,12 +45,6 @@ resize-right==0.0.2
 safetensors==0.2.7
 scikit-image==0.19.2
 timm==0.6.7
-fairscale==0.4.9
-piexif==1.1.3
-einops==0.4.1
-jsonmerge==1.8.0
-clean-fid==0.1.29
-resize-right==0.0.2
 torchdiffeq==0.2.3
 torchsde==0.2.5
 transformers==4.25.1
diff --git a/webui-macos-env.sh b/webui-macos-env.sh
deleted file mode 100644
index fa187dd10..000000000
--- a/webui-macos-env.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-####################################################################
-#                          macOS defaults                          #
-# Please modify webui-user.sh to change these instead of this file #
-####################################################################
-
-if [[ -x "$(command -v python3.10)" ]]
-then
-    python_cmd="python3.10"
-fi
-
-export install_dir="$HOME"
-export COMMANDLINE_ARGS="--skip-torch-cuda-test --upcast-sampling --use-cpu interrogate"
-export TORCH_COMMAND="pip install torch==1.12.1 torchvision==0.13.1"
-export K_DIFFUSION_REPO="https://github.com/brkirch/k-diffusion.git"
-export K_DIFFUSION_COMMIT_HASH="51c9778f269cedb55a4d88c79c0246d35bdadb71"
-export PYTORCH_ENABLE_MPS_FALLBACK=1
-
-####################################################################
diff --git a/webui.bat b/webui.bat
deleted file mode 100644
index 209d972bd..000000000
--- a/webui.bat
+++ /dev/null
@@ -1,85 +0,0 @@
-@echo off
-
-if not defined PYTHON (set PYTHON=python)
-if not defined VENV_DIR (set "VENV_DIR=%~dp0%venv")
-
-
-set ERROR_REPORTING=FALSE
-
-mkdir tmp 2>NUL
-
-%PYTHON% -c "" >tmp/stdout.txt 2>tmp/stderr.txt
-if %ERRORLEVEL% == 0 goto :check_pip
-echo Couldn't launch python
-goto :show_stdout_stderr
-
-:check_pip
-%PYTHON% -mpip --help >tmp/stdout.txt 2>tmp/stderr.txt
-if %ERRORLEVEL% == 0 goto :start_venv
-if "%PIP_INSTALLER_LOCATION%" == "" goto :show_stdout_stderr
-%PYTHON% "%PIP_INSTALLER_LOCATION%" >tmp/stdout.txt 2>tmp/stderr.txt
-if %ERRORLEVEL% == 0 goto :start_venv
-echo Couldn't install pip
-goto :show_stdout_stderr
-
-:start_venv
-if ["%VENV_DIR%"] == ["-"] goto :skip_venv
-if ["%SKIP_VENV%"] == ["1"] goto :skip_venv
-
-dir "%VENV_DIR%\Scripts\Python.exe" >tmp/stdout.txt 2>tmp/stderr.txt
-if %ERRORLEVEL% == 0 goto :activate_venv
-
-for /f "delims=" %%i in ('CALL %PYTHON% -c "import sys; print(sys.executable)"') do set PYTHON_FULLNAME="%%i"
-echo Creating venv in directory %VENV_DIR% using python %PYTHON_FULLNAME%
-%PYTHON_FULLNAME% -m venv "%VENV_DIR%" >tmp/stdout.txt 2>tmp/stderr.txt
-if %ERRORLEVEL% == 0 goto :activate_venv
-echo Unable to create venv in directory "%VENV_DIR%"
-goto :show_stdout_stderr
-
-:activate_venv
-set PYTHON="%VENV_DIR%\Scripts\Python.exe"
-echo venv %PYTHON%
-
-:skip_venv
-if [%ACCELERATE%] == ["True"] goto :accelerate
-goto :launch
-
-:accelerate
-echo Checking for accelerate
-set ACCELERATE="%VENV_DIR%\Scripts\accelerate.exe"
-if EXIST %ACCELERATE% goto :accelerate_launch
-
-:launch
-%PYTHON% launch.py %*
-pause
-exit /b
-
-:accelerate_launch
-echo Accelerating
-%ACCELERATE% launch --num_cpu_threads_per_process=6 launch.py
-pause
-exit /b
-
-:show_stdout_stderr
-
-echo.
-echo exit code: %errorlevel%
-
-for /f %%i in ("tmp\stdout.txt") do set size=%%~zi
-if %size% equ 0 goto :show_stderr
-echo.
-echo stdout:
-type tmp\stdout.txt
-
-:show_stderr
-for /f %%i in ("tmp\stderr.txt") do set size=%%~zi
-if %size% equ 0 goto :show_stderr
-echo.
-echo stderr:
-type tmp\stderr.txt
-
-:endofscript
-
-echo.
-echo Launch unsuccessful. Exiting.
-pause