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