diff --git a/extensions-builtin/sd-extension-steps-animation b/extensions-builtin/sd-extension-steps-animation
index 71006b890..e91497c0d 160000
--- a/extensions-builtin/sd-extension-steps-animation
+++ b/extensions-builtin/sd-extension-steps-animation
@@ -1 +1 @@
-Subproject commit 71006b8905e881636f457ed702d3a65e4b334bfe
+Subproject commit e91497c0dea92cb6fcccdd1109a648be4b86bea0
diff --git a/requirements.txt b/requirements.txt
index ffcc34d0d..7a6ffa1a6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,16 +1,11 @@
 accelerate
 aenum
 basicsr
-<<<<<<< HEAD
-fonts
-=======
 blendmodes
 clean-fid
 einops
-fairscale
 fastapi
 filetype
->>>>>>> 92b4fbe (update requirements)
 font-roboto
 fonts
 gfpgan
@@ -27,26 +22,6 @@ omegaconf
 opencv-contrib-python
 piexif
 Pillow
-<<<<<<< HEAD
-pytorch_lightning==1.7.7
-realesrgan
-scikit-image>=0.19
-timm==0.4.12
-transformers==4.25.1
-torch
-einops
-jsonmerge
-clean-fid
-resize-right
-torchdiffeq
-kornia
-lark
-inflection
-GitPython
-torchsde
-safetensors
-=======
->>>>>>> 92b4fbe (update requirements)
 psutil
 pytorch_lightning
 realesrgan
diff --git a/requirements_versions.txt b/requirements_versions.txt
index a7856d6fb..902ed1fc9 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -1,31 +1,8 @@
-<<<<<<< HEAD
-blendmodes==2022
-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
diff --git a/ui-config.json b/ui-config.json
index 7bd66e6c4..0e67c591a 100644
--- a/ui-config.json
+++ b/ui-config.json
@@ -802,5 +802,45 @@
     "customscript/postprocessing_codeformer.py/extras/CodeFormer weight (0 = maximum effect, 1 = minimum effect)/value": 0,
     "customscript/postprocessing_codeformer.py/extras/CodeFormer weight (0 = maximum effect, 1 = minimum effect)/minimum": 0.0,
     "customscript/postprocessing_codeformer.py/extras/CodeFormer weight (0 = maximum effect, 1 = minimum effect)/maximum": 1.0,
-    "customscript/postprocessing_codeformer.py/extras/CodeFormer weight (0 = maximum effect, 1 = minimum effect)/step": 0.001
+    "customscript/postprocessing_codeformer.py/extras/CodeFormer weight (0 = maximum effect, 1 = minimum effect)/step": 0.001,
+    "customscript/xyz_grid.py/txt2img/X type/visible": true,
+    "customscript/xyz_grid.py/txt2img/X type/value": "Seed",
+    "customscript/xyz_grid.py/txt2img/X values/visible": true,
+    "customscript/xyz_grid.py/txt2img/X values/value": "",
+    "customscript/xyz_grid.py/txt2img/Y type/visible": true,
+    "customscript/xyz_grid.py/txt2img/Y type/value": "Nothing",
+    "customscript/xyz_grid.py/txt2img/Y values/visible": true,
+    "customscript/xyz_grid.py/txt2img/Y values/value": "",
+    "customscript/xyz_grid.py/txt2img/Z type/visible": true,
+    "customscript/xyz_grid.py/txt2img/Z type/value": "Nothing",
+    "customscript/xyz_grid.py/txt2img/Z values/visible": true,
+    "customscript/xyz_grid.py/txt2img/Z values/value": "",
+    "customscript/xyz_grid.py/txt2img/Draw legend/visible": true,
+    "customscript/xyz_grid.py/txt2img/Draw legend/value": true,
+    "customscript/xyz_grid.py/txt2img/Include Sub Images/visible": true,
+    "customscript/xyz_grid.py/txt2img/Include Sub Images/value": false,
+    "customscript/xyz_grid.py/txt2img/Include Sub Grids/visible": true,
+    "customscript/xyz_grid.py/txt2img/Include Sub Grids/value": false,
+    "customscript/xyz_grid.py/txt2img/Keep -1 for seeds/visible": true,
+    "customscript/xyz_grid.py/txt2img/Keep -1 for seeds/value": false,
+    "customscript/xyz_grid.py/img2img/X type/visible": true,
+    "customscript/xyz_grid.py/img2img/X type/value": "Seed",
+    "customscript/xyz_grid.py/img2img/X values/visible": true,
+    "customscript/xyz_grid.py/img2img/X values/value": "",
+    "customscript/xyz_grid.py/img2img/Y type/visible": true,
+    "customscript/xyz_grid.py/img2img/Y type/value": "Nothing",
+    "customscript/xyz_grid.py/img2img/Y values/visible": true,
+    "customscript/xyz_grid.py/img2img/Y values/value": "",
+    "customscript/xyz_grid.py/img2img/Z type/visible": true,
+    "customscript/xyz_grid.py/img2img/Z type/value": "Nothing",
+    "customscript/xyz_grid.py/img2img/Z values/visible": true,
+    "customscript/xyz_grid.py/img2img/Z values/value": "",
+    "customscript/xyz_grid.py/img2img/Draw legend/visible": true,
+    "customscript/xyz_grid.py/img2img/Draw legend/value": true,
+    "customscript/xyz_grid.py/img2img/Include Sub Images/visible": true,
+    "customscript/xyz_grid.py/img2img/Include Sub Images/value": false,
+    "customscript/xyz_grid.py/img2img/Include Sub Grids/visible": true,
+    "customscript/xyz_grid.py/img2img/Include Sub Grids/value": false,
+    "customscript/xyz_grid.py/img2img/Keep -1 for seeds/visible": true,
+    "customscript/xyz_grid.py/img2img/Keep -1 for seeds/value": false
 }
\ No newline at end of file