diff --git a/.vs/ComfyUI/v17/.suo b/.vs/ComfyUI/v17/.suo
index d493b9bdd..69729b930 100644
Binary files a/.vs/ComfyUI/v17/.suo and b/.vs/ComfyUI/v17/.suo differ
diff --git a/web/extensions/core/widgetInputs.js b/web/extensions/core/widgetInputs.js
index 37cd3fa05..8343726f1 100644
--- a/web/extensions/core/widgetInputs.js
+++ b/web/extensions/core/widgetInputs.js
@@ -288,18 +288,10 @@ app.registerExtension({
 						widget.value = theirWidget.value;
 					}
 				}
-
-<<<<<<< HEAD
 				if (widget.type === "combo") {
 					addSeedControlWidget(this, widget, "randomize");
                 }
-					
-=======
-				if (widget.type === "combo")
-					addSeedControlWidget(this, widget, "randomize");
-				
 
->>>>>>> fbe3df1ec837d298aaab68bab81c967182d2bab6
 				// 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/widgets.js b/web/scripts/widgets.js
index ee58c0815..c073f365e 100644
--- a/web/scripts/widgets.js
+++ b/web/scripts/widgets.js
@@ -54,11 +54,7 @@ export function addSeedControlWidget(node, targetWidget, defaultValue = "randomi
 }
 
 function seedWidget(node, inputName, inputData) {
-<<<<<<< HEAD
-	const seed = ComfyWidgets.COMBO(node, inputName, inputData);
-=======
 	const seed = ComfyWidgets.INT(node, inputName, inputData);
->>>>>>> fbe3df1ec837d298aaab68bab81c967182d2bab6
 	const seedControl = addSeedControlWidget(node, seed.widget, "randomize");
 
 	seed.widget.linkedWidgets = [seedControl];