diff --git a/front/server.form.php b/front/server.form.php
index b7bc5e8..ef97b14 100644
--- a/front/server.form.php
+++ b/front/server.form.php
@@ -27,11 +27,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
             ServerAsset::connectAssetToServer($itemtype, $items_id, $server_id);
         }
 
-<<<<<<< HEAD
         Html::redirect(PLUGIN_URBACKUP_WEB_DIR . '/front/server.form.php?id=' . $server_id);
-=======
-        Html::redirect(PLUGIN_URBACKUP_WEB_DIR . '/front/server.php?id=' . $server_id);
->>>>>>> collegamento_e_verifica_host
     }
 
     $id = $_POST['id'] ?? 0;