diff --git a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php
index f17268e..8a4e8c2 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php
+++ b/presentation/lookAndFeel/knowledgeTree/administration/groupmanagement/editGroupSuccess.php
@@ -9,11 +9,8 @@
 */
 
 require_once("../../../../../config/dmsDefaults.php");
-<<<<<<< editGroupSuccess.php
 require_once("../adminUI.inc");
 require_once("$default->fileSystemRoot/presentation/Html.inc");
-=======
->>>>>>> 1.7
 
 global $default;