diff --git a/www/include/configuration/configObject/contact/formContact.php b/www/include/configuration/configObject/contact/formContact.php
index bfe1d15ed5e6d8188026b12edbc6b67f70dfbc2f..9b6fd9e2f735feef2e0870965d9e2857f49dda51 100644
--- a/www/include/configuration/configObject/contact/formContact.php
+++ b/www/include/configuration/configObject/contact/formContact.php
@@ -793,9 +793,4 @@ if ($valid) {
             document.getElementById('sNone').checked = false;
         }
     }
-<<<<<<< HEAD
 </script>
-=======
-}
-</script>
->>>>>>> 1c456741a... feat(api): Split role between configuration and realtime