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;
 }