diff --git a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
index c36a9ef1..ef5e02cd 100644
--- a/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/defaults/main.yml
@@ -8,9 +8,5 @@ elastic_stack_version: 6.5.4
 elasticsearch_shards: 5
 elasticsearch_replicas: 1
 elasticsearch_install_java: yes
-<<<<<<< HEAD
 elasticrepo_gpg_keyserver: pool.sks-keyservers.net
 elasticrepo_server: https://artifacts.elastic.co/packages/6.x/apt
-=======
-elasticrepo_gpg_keyserver: pgp.mit.edu
->>>>>>> debian repo keys with pgp keyserver
diff --git a/roles/elastic-stack/ansible-kibana/defaults/main.yml b/roles/elastic-stack/ansible-kibana/defaults/main.yml
index 88893f0c..2b02b8b4 100644
--- a/roles/elastic-stack/ansible-kibana/defaults/main.yml
+++ b/roles/elastic-stack/ansible-kibana/defaults/main.yml
@@ -5,11 +5,7 @@ kibana_server_host: "0.0.0.0"
 kibana_server_port: "5601"
 elastic_stack_version: 6.5.4
 wazuh_version: 3.8.2
-<<<<<<< HEAD
 elasticrepo_gpg_keyserver: pool.sks-keyservers.net
 elasticrepo_server: https://artifacts.elastic.co/packages/6.x/apt
 wazuhapp_location: https://packages.wazuh.com/wazuhapp
 
-=======
-elasticrepo_gpg_keyserver: pgp.mit.edu
->>>>>>> debian repo keys with pgp keyserver
diff --git a/roles/elastic-stack/ansible-logstash/defaults/main.yml b/roles/elastic-stack/ansible-logstash/defaults/main.yml
index fdc11b82..0be1cc56 100644
--- a/roles/elastic-stack/ansible-logstash/defaults/main.yml
+++ b/roles/elastic-stack/ansible-logstash/defaults/main.yml
@@ -18,9 +18,5 @@ logstash_ssl_key_file: ""
 
 logstash_install_java: yes
 
-<<<<<<< HEAD
 elasticrepo_gpg_keyserver: pool.sks-keyservers.net
 elasticrepo_server: https://artifacts.elastic.co/packages/6.x/apt
-=======
-elasticrepo_gpg_keyserver: pgp.mit.edu
->>>>>>> debian repo keys with pgp keyserver
diff --git a/roles/wazuh/ansible-filebeat/defaults/main.yml b/roles/wazuh/ansible-filebeat/defaults/main.yml
index c41838a1..5f3023c1 100644
--- a/roles/wazuh/ansible-filebeat/defaults/main.yml
+++ b/roles/wazuh/ansible-filebeat/defaults/main.yml
@@ -28,9 +28,5 @@ filebeat_ssl_certificate_file: ""
 filebeat_ssl_key_file: ""
 filebeat_ssl_insecure: "false"
 
-<<<<<<< HEAD
 elasticrepo_gpg_keyserver: pool.sks-keyservers.net
 elasticrepo_server: https://artifacts.elastic.co/packages/6.x/apt
-=======
-elasticrepo_gpg_keyserver: pgp.mit.edu
->>>>>>> debian repo keys with pgp keyserver
diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
index 77b38746..069d1905 100644
--- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
@@ -306,9 +306,5 @@ wazuh_agent_config:
       - key: Env
         value: Production
 
-<<<<<<< HEAD
 wauzhrepo_gpg_keyserver: pool.sks-keyservers.net
 wazuhrepo_server: https://packages.wazuh.com/3.x/apt/
-=======
-wauzhrepo_gpg_keyserver: pgp.mit.edu
->>>>>>> debian repo keys with pgp keyserver
diff --git a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
index 9f05f727..66f46837 100644
--- a/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/defaults/main.yml
@@ -330,12 +330,7 @@ wazuh_agent_configs:
       - location: 'System'
         format: 'eventlog'
 
-<<<<<<< HEAD
 wauzhrepo_gpg_keyserver: pool.sks-keyservers.net
 nodejsrepo_gpg_keyserver: pool.sks-keyservers.net
 wazuhrepo_server: https://packages.wazuh.com/3.x/apt/
 nodejsrepo_server: https://deb.nodesource.com/node_6.x
-=======
-wauzhrepo_gpg_keyserver: pgp.mit.edu
-nodejsrepo_gpg_keyserver: pgp.mit.edu
->>>>>>> debian repo keys with pgp keyserver