diff --git a/VERSION b/VERSION
index fe299427..b4586bf4 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
-WAZUH-ANSIBLE_VERSION="v4.7.0"
-REVISION="40703"
-=======
 WAZUH-ANSIBLE_VERSION="v4.7.1"
 REVISION="40705"
->>>>>>> 018da92c8c21f9d194729532c6b042bc1be4dee7