diff --git a/src/templateDetails.xml b/src/templateDetails.xml
index b17a1fb..36463ec 100644
--- a/src/templateDetails.xml
+++ b/src/templateDetails.xml
@@ -36,11 +36,7 @@
 		</server>
 	</updateservers>
 	<name>mokoonyx</name>
-<<<<<<< HEAD
 	<version>02.15.01-dev</version>
-=======
-	<version>02.15.00</version>
->>>>>>> origin/main
 	<scriptfile>script.php</scriptfile>
 	<creationDate>2026-05-16</creationDate>
 	<author>Jonathan Miller || Moko Consulting</author>