diff --git a/README.md b/README.md
index dc6b9b4c6..91193d9a0 100644
--- a/README.md
+++ b/README.md
@@ -35,33 +35,6 @@ 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
@@ -105,4 +78,3 @@ 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/config.json b/config.json
index f8adb04ca..f93ffade8 100644
--- a/config.json
+++ b/config.json
@@ -140,6 +140,7 @@
     "eta_noise_seed_delta": 0,
     "always_discard_next_to_last_sigma": false,
     "disabled_extensions": [
+        "sd-webui-additional-networks",
         "sdweb-merge-board",
         "ScuNET"
     ],
@@ -173,5 +174,8 @@
     ],
     "extra_networks_default_view": "cards",
     "postprocessing_scipts_order": "upscale, gfpgan, codeformer",
-    "upscaling_max_images_in_cache": 5
+    "upscaling_max_images_in_cache": 5,
+    "upcast_attn": false,
+    "lora_apply_to_outputs": false,
+    "outdir_ip2p_samples": "outputs/ip2p-images"
 }
\ No newline at end of file
diff --git a/extensions-builtin/sd-extension-system-info b/extensions-builtin/sd-extension-system-info
index 63f6fe7cc..82a51b31f 160000
--- a/extensions-builtin/sd-extension-system-info
+++ b/extensions-builtin/sd-extension-system-info
@@ -1 +1 @@
-Subproject commit 63f6fe7cc8eb5586e822ebaddda85b6c03876127
+Subproject commit 82a51b31f37439dd571747196820e42ef26d4572
diff --git a/requirements_versions.txt b/requirements_versions.txt
index 902ed1fc9..f429a3940 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -1,27 +1,26 @@
 accelerate==0.15.0
 basicsr==1.4.2
 blendmodes==2022
-clean-fid==0.1.29
+clean-fid==0.1.35
 einops==0.4.1
 gfpgan==1.3.8
-GitPython==3.1.27
+GitPython==3.1.30
 gradio==3.16.2
-httpcore<=0.15
 inflection==0.5.1
-jsonmerge==1.8.0
+jsonmerge==1.9.0
 kornia==0.6.7
-lark==1.1.2
+lark==1.1.5
 numpy==1.23.5
-omegaconf==2.2.3
+omegaconf==2.3.0
 piexif==1.1.3
 Pillow==9.4.0
 protobuf==3.20.3
 pytorch_lightning==1.7.7
 realesrgan==0.3.0
 resize-right==0.0.2
-safetensors==0.2.7
-scikit-image==0.19.2
-timm==0.6.7
+safetensors==0.2.8
+scikit-image==0.19.3
+timm==0.6.12
 torchdiffeq==0.2.3
 torchsde==0.2.5
 transformers==4.25.1
diff --git a/wiki b/wiki
index e465ffb28..d475aa073 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit e465ffb2840ea42c5507d293faf8b5d41aec2e59
+Subproject commit d475aa073b421bfe695326dbc9aedd9100c2425a