diff --git a/js/index.js b/js/index.js
index dfa489a..c81d30c 100644
--- a/js/index.js
+++ b/js/index.js
@@ -397,7 +397,7 @@ function checkProgress(bb) {
 
 				document.getElementById("estRemaining").innerText = estimate;
 			});
-	}, 1500);
+	}, 1000);
 }
 
 function mouseMove(evt) {
diff --git a/js/ui/toolbar.js b/js/ui/toolbar.js
index 91fba77..d188a29 100644
--- a/js/ui/toolbar.js
+++ b/js/ui/toolbar.js
@@ -358,7 +358,14 @@ tools.img2img = toolbar.registerTool(
 			menu.appendChild(state.ctxmenu.snapToGridLabel);
 			menu.appendChild(document.createElement("br"));
 			menu.appendChild(state.ctxmenu.denoisingStrengthSlider);
+<<<<<<< HEAD
 			menu.appendChild(state.ctxmenu.borderMaskSlider);
+=======
+			menu.appendChild(document.createElement("br"));
+			menu.appendChild(state.ctxmenu.useBorderMaskSlider);
+			menu.appendChild(document.createElement("br"));
+			menu.appendChild(state.ctxmenu.borderMaskSize);
+>>>>>>> main
 		},
 		shortcut: "I",
 	}