diff --git a/templates/minecraft_server_unraid.xml b/templates/minecraft_server_unraid.xml
index 1bdfbdf..b9a3430 100644
--- a/templates/minecraft_server_unraid.xml
+++ b/templates/minecraft_server_unraid.xml
@@ -23,11 +23,7 @@
   <DonateLink>https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2</DonateLink>
   <Description>This docker is for running Minecraft vanilla server on java 17. If you want to run an older version of Minecraft all you need to do is change the tag from latest to the version that you want to run, currently as far back as 1.16.5.</Description>
   <Beta>False</Beta>
-<<<<<<< HEAD
   <Date>2022-06-16</Date>
-=======
-  <Date>2022-06-13</Date>
->>>>>>> 8ea521678fc3492e36e45a7eea2ee4ba3a54d516
   <Changes>[font size=4][center]minecraft-debian[/center][/font]
 
 [font size=3][b](2020-07-01)[/b][/font]