diff --git a/web/extensions/core/widgetInputs.js b/web/extensions/core/widgetInputs.js
index 5bab8d177..b95621094 100644
--- a/web/extensions/core/widgetInputs.js
+++ b/web/extensions/core/widgetInputs.js
@@ -167,8 +167,11 @@ app.registerExtension({
 				const node = LiteGraph.createNode("PrimitiveNode");
 				app.graph.add(node);
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
+=======
+>>>>>>> parent of ec3e40e (flyingshutter's code added, in working order)
 				node.widgets.addSeedControlWidget(node,node.widgets[0],"randomize");
 
 >>>>>>> parent of ec3e40e (flyingshutter's code added, in working order)
@@ -307,6 +310,9 @@ app.registerExtension({
 					if (widget.type === "number") {
 						addSeedControlWidget(this, widget, "fixed seed");
 					}
+<<<<<<< HEAD
+>>>>>>> parent of ec3e40e (flyingshutter's code added, in working order)
+=======
 >>>>>>> parent of ec3e40e (flyingshutter's code added, in working order)
 				}