diff --git a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
index 06f2833d..300c7c93 100644
--- a/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
+++ b/roles/wazuh/ansible-wazuh-agent/defaults/main.yml
@@ -1,8 +1,4 @@
 ---
-<<<<<<< HEAD
-=======
-wazuh_agent_version: 4.2.3-1
->>>>>>> 4.2
 
 wazuh_agent_version: 4.3.0-1
 
@@ -16,11 +12,7 @@ wazuh_custom_packages_installation_agent_rpm_url: ""
 
 wazuh_agent_sources_installation:
   enabled: false
-<<<<<<< HEAD
   branch: "v4.3.0"
-=======
-  branch: "v4.2.3"
->>>>>>> 4.2
   user_language: "y"
   user_no_stop: "y"
   user_install_type: "agent"