From e21e60968bd9a688c396eb2e6a7344741c806fdd Mon Sep 17 00:00:00 2001
From: FizzleDorf <1fizzledorf@gmail.com>
Date: Fri, 31 Mar 2023 18:50:47 -0400
Subject: [PATCH 1/2] comments

---
 web/extensions/core/widgetInputs.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/extensions/core/widgetInputs.js b/web/extensions/core/widgetInputs.js
index 39164383a..89deca304 100644
--- a/web/extensions/core/widgetInputs.js
+++ b/web/extensions/core/widgetInputs.js
@@ -264,6 +264,7 @@ app.registerExtension({
 				this.outputs[0].name = type;
 				this.outputs[0].widget = widget;
 
+				//make sure the seedControl is added to the correct Primitive node labelled "seed"
 				if (widget.name === "seed") {
 					const seed = this.#createWidget(widget.config, theirNode, widget.name);
 					const seedControl = addSeedControlWidget(this, seed, "randomize");

From 27bae076bf338b6a9a7bb4804c1cd0e74c019617 Mon Sep 17 00:00:00 2001
From: FizzleDorf <1fizzledorf@gmail.com>
Date: Fri, 31 Mar 2023 19:03:09 -0400
Subject: [PATCH 2/2] resolved merge

---
 web/extensions/core/widgetInputs.js | 3 ---
 web/scripts/app.js                  | 7 -------
 web/scripts/widgets.js              | 3 ---
 3 files changed, 13 deletions(-)

diff --git a/web/extensions/core/widgetInputs.js b/web/extensions/core/widgetInputs.js
index 3a05c34e8..90b56aa72 100644
--- a/web/extensions/core/widgetInputs.js
+++ b/web/extensions/core/widgetInputs.js
@@ -301,13 +301,10 @@ app.registerExtension({
 					}
 				}
 
-<<<<<<< HEAD
-=======
 				if (widget.type === "combo") {
 					addSeedControlWidget(this, widget, "randomize");
 				}
 
->>>>>>> origin/master
 				// When our value changes, update other widgets to reflect our changes
 				// e.g. so LoadImage shows correct image
 				const callback = widget.callback;
diff --git a/web/scripts/app.js b/web/scripts/app.js
index 64afaa19e..fe3d11d1e 100644
--- a/web/scripts/app.js
+++ b/web/scripts/app.js
@@ -828,18 +828,11 @@ class ComfyApp {
 								widget.value = widget.value.slice(7);
 							}
 						}
-<<<<<<< HEAD
 						if (widget.name == "seed control after generating") {
 							if (widget.value == true) {
 								widget.value = "randomize";
 							}
-=======
 
-						if (widget.name == "seed control after generating") {
-							if (widget.value == true) {
-								widget.value = "randomize";
-                            }
->>>>>>> origin/master
 						}
 					}
 				}
diff --git a/web/scripts/widgets.js b/web/scripts/widgets.js
index ad90eef33..4f7f169b3 100644
--- a/web/scripts/widgets.js
+++ b/web/scripts/widgets.js
@@ -50,10 +50,7 @@ export function addSeedControlWidget(node, targetWidget, defaultValue = "randomi
 				console.log("default (fail)");
 		}
 	};
-<<<<<<< HEAD
-=======
 
->>>>>>> origin/master
 	return seedControl;
 }