diff --git a/pandora_console/extras/mr/58.sql b/pandora_console/extras/mr/58.sql
index 31807018ef..5fe303aa70 100644
--- a/pandora_console/extras/mr/58.sql
+++ b/pandora_console/extras/mr/58.sql
@@ -11,15 +11,13 @@ ALTER TABLE `tmodule_inventory` ADD COLUMN `script_path` VARCHAR(1000) DEFAULT '
 
 ALTER TABLE `tevent_filter` ADD COLUMN `search_recursive_groups` INT NOT NULL DEFAULT 0;
 
-<<<<<<< HEAD
 ALTER TABLE `tagente_modulo` ADD COLUMN `warning_time` int(10) UNSIGNED DEFAULT 0;
 ALTER TABLE `tnetwork_component` ADD COLUMN `warning_time` int(10) UNSIGNED DEFAULT 0;
 ALTER TABLE `tlocal_component` ADD COLUMN `warning_time` int(10) UNSIGNED DEFAULT 0;
 ALTER TABLE `tpolicy_modules` ADD COLUMN `warning_time` int(10) UNSIGNED DEFAULT 0;
 
 ALTER TABLE `tagente_estado` ADD COLUMN `warning_count` int(10) UNSIGNED DEFAULT 0;
-=======
+
 ALTER TABLE `tcredential_store` MODIFY COLUMN `product` ENUM('CUSTOM', 'AWS', 'AZURE', 'GOOGLE', 'SAP', 'WMI', 'SNMP') DEFAULT 'CUSTOM';
->>>>>>> develop
 
 COMMIT;