diff --git a/pandora_console/extras/mr/20.sql b/pandora_console/extras/mr/20.sql
index 58aa5bf708..eae836b611 100644
--- a/pandora_console/extras/mr/20.sql
+++ b/pandora_console/extras/mr/20.sql
@@ -18,10 +18,20 @@ ALTER TABLE `tlayout_template_data` ADD COLUMN `linked_layout_status_as_service_
 ALTER TABLE `tlayout_template_data` ADD COLUMN `linked_layout_status_as_service_critical` FLOAT(20, 3) NOT NULL default 0;
 ALTER TABLE `tlayout_template_data` ADD COLUMN `linked_layout_node_id` INT(10) NOT NULL default 0;
 
+<<<<<<< Updated upstream
 -- -----------------------------------------------------
 -- Add column in table `treport`
 -- -----------------------------------------------------
 
 ALTER TABLE `treport` ADD COLUMN `hidden` tinyint(1) NOT NULL DEFAULT 0;
+=======
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_version` varchar(5) NOT NULL default '1';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_user` varchar(255) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_pass` varchar(255) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_method` varchar(25) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_privacy_method` varchar(25) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_privacy_pass` varchar(255) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_security_level` varchar(25) NOT NULL default '';
+>>>>>>> Stashed changes
 
 COMMIT;
\ No newline at end of file
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index dd39b6159f..93533705bc 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1774,3 +1774,12 @@ CREATE TABLE IF NOT EXISTS `tlayout_template_data` (
 -- -----------------------------------------------------
 
 ALTER TABLE `treport` ADD COLUMN `hidden` tinyint(1) NOT NULL DEFAULT 0;
+
+
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_version` varchar(5) NOT NULL default '1';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_user` varchar(255) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_pass` varchar(255) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_auth_method` varchar(25) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_privacy_method` varchar(25) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_privacy_pass` varchar(255) NOT NULL default '';
+ALTER TABLE `trecon_task` ADD COLUMN `snmp_security_level` varchar(25) NOT NULL default '';
diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql
index b6b1511bec..e7ff8cdc59 100644
--- a/pandora_console/pandoradb.sql
+++ b/pandora_console/pandoradb.sql
@@ -775,6 +775,13 @@ CREATE TABLE IF NOT EXISTS `trecon_task` (
 	`alias_as_name` tinyint(2) NOT NULL default '0',
 	`snmp_enabled` tinyint(1) unsigned default '0',
 	`vlan_enabled` tinyint(1) unsigned default '0',
+	`snmp_version` varchar(5) NOT NULL default '1',
+	`snmp_auth_user` varchar(255) NOT NULL default '',
+	`snmp_auth_pass` varchar(255) NOT NULL default '',
+	`snmp_auth_method` varchar(25) NOT NULL default '',
+	`snmp_privacy_method` varchar(25) NOT NULL default '',
+	`snmp_privacy_pass` varchar(255) NOT NULL default '',
+	`snmp_security_level` varchar(25) NOT NULL default '',
 	PRIMARY KEY  (`id_rt`),
 	KEY `recon_task_daemon` (`id_recon_server`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
@@ -3330,3 +3337,4 @@ CREATE TABLE IF NOT EXISTS `tlayout_template_data` (
 	PRIMARY KEY(`id`),
 	FOREIGN KEY (`id_layout_template`) REFERENCES tlayout_template(`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE = InnoDB DEFAULT CHARSET=utf8;
+