diff --git a/app/renderer/js/pages/preference/new-server-form.ts b/app/renderer/js/pages/preference/new-server-form.ts
index b7f059fe3..14817f950 100644
--- a/app/renderer/js/pages/preference/new-server-form.ts
+++ b/app/renderer/js/pages/preference/new-server-form.ts
@@ -56,7 +56,6 @@ export function initNewServerForm({$root, onChange}: NewServerFormProps): void {
     "input.setting-input-value",
   )!;
 
-<<<<<<< HEAD
   async function submitFormHandler(): Promise<void> {
     $saveServerButton.textContent = "Connecting...";
     let serverConf;