diff --git a/inc/webadmin-edit.php b/inc/webadmin-edit.php
index 6c47a4e..49551ca 100644
--- a/inc/webadmin-edit.php
+++ b/inc/webadmin-edit.php
@@ -248,21 +248,11 @@ elseif (isset($params[2]) && $params[2] == "add") {
         print "     </fieldset>";
         print "</form>";
 
-<<<<<<< HEAD
-<<<<<<< HEAD
     }
 
     include_once EVOADMIN_BASE . '../tpl/footer.tpl.php';
 }
-=======
-    }
->>>>>>> added select element to link a new alias to a domain
 
-=======
-    include_once EVOADMIN_BASE . '../tpl/footer.tpl.php';
-}
-
->>>>>>> alias url changed
 else {
 
     $domain = $params[1];