diff --git a/web/extensions/core/widgetInputs.js b/web/extensions/core/widgetInputs.js
index 86812b10c..bf9c66338 100644
--- a/web/extensions/core/widgetInputs.js
+++ b/web/extensions/core/widgetInputs.js
@@ -287,15 +287,10 @@ app.registerExtension({
 						widget.value = theirWidget.value;
 					}
 				}
-<<<<<<< HEAD
 				
 				if (widget.type === "combo") {
 					addSeedControlWidget(this, widget, "randomize");
-=======
 
-				if (widget.type === "combo") {
-					addSeedControlWidget(this, widget, "fixed seed");
->>>>>>> 1518b385a7a2f22887dabd97f45548197f65fad3
 				}
 
 				// When our value changes, update other widgets to reflect our changes
diff --git a/web/scripts/app.js b/web/scripts/app.js
index 2770ae344..2c59a0e44 100644
--- a/web/scripts/app.js
+++ b/web/scripts/app.js
@@ -771,17 +771,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 = "fixed seed";
->>>>>>> 1518b385a7a2f22887dabd97f45548197f65fad3
                             }
 						}
 					}
diff --git a/web/scripts/widgets.js b/web/scripts/widgets.js
index 6ca8b518a..2681675bc 100644
--- a/web/scripts/widgets.js
+++ b/web/scripts/widgets.js
@@ -10,13 +10,8 @@ function getNumberDefaults(inputData, defaultStep) {
 	return { val: defaultVal, config: { min, max, step: 10.0 * step } };
 }
 
-<<<<<<< HEAD
 export function addSeedControlWidget(node, targetWidget, defaultValue = "randomize", values) {
 	const seedControl = node.addWidget("combo", "seed control after generating", "randomize", function (v) { }, {
-=======
-export function addSeedControlWidget(node, targetWidget, defaultValue = "fixed seed", values) {
-	const seedControl = node.addWidget("combo", "seed control after generating", "fixed seed", function (v) { }, {
->>>>>>> 1518b385a7a2f22887dabd97f45548197f65fad3
 		values: ["fixed seed", "increment", "decrement", "randomize"]
 	})
 	seedControl.afterQueued = () => {
@@ -55,21 +50,13 @@ export function addSeedControlWidget(node, targetWidget, defaultValue = "fixed s
 				console.log("default (fail)");
 		}
 	};
-<<<<<<< HEAD
-	
-=======
-
->>>>>>> 1518b385a7a2f22887dabd97f45548197f65fad3
 	return seedControl;
 }
 
 function seedWidget(node, inputName, inputData) {
 	const seed = ComfyWidgets.INT(node, inputName, inputData);
-<<<<<<< HEAD
 	const seedControl = addSeedControlWidget(node, seed.widget, "randomize");
-=======
-	const seedControl = addSeedControlWidget(node, seed.widget, "fixed seed");
->>>>>>> 1518b385a7a2f22887dabd97f45548197f65fad3
+
 
 	seed.widget.linkedWidgets = [seedControl];
 	return { widget: seed, seedControl };