diff --git a/pandora_console/include/constants.php b/pandora_console/include/constants.php
index da8a4266a7..ce0b5738bd 100644
--- a/pandora_console/include/constants.php
+++ b/pandora_console/include/constants.php
@@ -463,14 +463,11 @@ define("OPTION_SINGLE_SELECT_TIME",		7);
 define("OPTION_CUSTOM_INPUT",			8);
 define("OPTION_AGENT_AUTOCOMPLETE",		9);
 
-/* SAML attributes constants */
-
-<<<<<<< HEAD
 /* Transactional map constants */
 define("NODE_TYPE", 0);
 define("ARROW_TYPE", 1);
 
-=======
+/* SAML attributes constants */
 define("SAML_ROLE_AND_TAG", "eduPersonEntitlement");
 define("SAML_USER_DESC", "commonName");
 define("SAML_ID_USER_IN_PANDORA", "eduPersonTargetedId");
@@ -529,5 +526,4 @@ define("DEFAULT_NODE_COLOR", COL_NOTINIT);
 define("DEFAULT_NODE_IMAGE", "images/networkmap/unknown.png");
 
 define("NODE_IMAGE_PADDING", 5);
->>>>>>> develop
 ?>
diff --git a/pandora_console/operation/menu.php b/pandora_console/operation/menu.php
index 831cf8947e..f0da3a9cec 100644
--- a/pandora_console/operation/menu.php
+++ b/pandora_console/operation/menu.php
@@ -121,9 +121,8 @@ if (check_acl ($config['id_user'], 0, "AR")) {
 		"operation/agentes/networkmap"
 		);
 	
-<<<<<<< HEAD
 	enterprise_hook ('transmap_console');
-=======
+	
 	$sub["operation/maps/networkmap_list"]["text"] = __('(Temp) Network map');
 	$sub["operation/maps/networkmap_list"]["id"] = '(Temp) Network map';
 	$sub["operation/maps/networkmap_list"]["refr"] = 0;
@@ -131,9 +130,6 @@ if (check_acl ($config['id_user'], 0, "AR")) {
 		"operation/maps/networkmap"
 		);
 	
-	
->>>>>>> develop
-	
 	enterprise_hook ('networkmap_console');
 	
 	enterprise_hook ('services_menu');