diff --git a/templates/FoundryVTT_alpine_unraid.xml b/templates/FoundryVTT_alpine_unraid.xml
index 0b4706c..99457c6 100644
--- a/templates/FoundryVTT_alpine_unraid.xml
+++ b/templates/FoundryVTT_alpine_unraid.xml
@@ -31,7 +31,7 @@ Connect to the server using the host IP address and port 30000 once connected it
 Connect to the server using the host IP address and port 30000 once connected it will ask you for a licence code.[br][br]
 [b][u][span style='color: #E80000;']Notes[/span][/u][/b][br]If you run into permission problems with some files simply restart the docker and it will fix itself. i am working on a propor fix for this problem[br]</Description>
   <Beta>False</Beta>
-  <Date>2022-13-13</Date>
+  <Date>2022-06-13</Date>
   <Changes>
 [font size=4][center]FoundryVTT-alpine[/center][/font]
 [font size=3][b](2020-07-13)[/b][/font]
diff --git a/templates/minecraft_server_unraid.xml b/templates/minecraft_server_unraid.xml
index 3eda56e..64b5ad7 100644
--- a/templates/minecraft_server_unraid.xml
+++ b/templates/minecraft_server_unraid.xml
@@ -23,7 +23,11 @@
   <DonateLink>https://checkout.square.site/pay/340d93c602a042b8a223a2f7c184a6a2</DonateLink>
   <Description>This docker is for running Minecraft vanilla server version 1.18 and java 17. You can run a modded server you can just do not delete the files that are in the folder.</Description>
   <Beta>False</Beta>
-  <Date>2022-13-13</Date>
+<<<<<<< HEAD
+  <Date>2022-06-13</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]
 &#x00a0;&#x00a0;- First Test.
diff --git a/templates/ts3server-basic_alpine_unraid.xml b/templates/ts3server-basic_alpine_unraid.xml
index 932959c..b72e1e2 100644
--- a/templates/ts3server-basic_alpine_unraid.xml
+++ b/templates/ts3server-basic_alpine_unraid.xml
@@ -33,7 +33,7 @@ To authenticate use the privilege key shown in the supervisord.log file in the /
 Connect to the server using the TeamSpeak client with the host IP address and port 9987.[br]
 To authenticate use the privilege key shown in the supervisord.log file in the /teamspeak3 folder.</Description>
   <Beta>False</Beta>
-  <Date>2022-13-13</Date>
+  <Date>2022-06-13</Date>
   <Changes>[font size=4][center]teamspeak3[/center][/font]
 [font size=3][b](2020-06-24)[/b][/font]
 &#x00a0;&#x00a0;- First creation uses built in DB.
diff --git a/templates/ts3server_alpine_unraid.xml b/templates/ts3server_alpine_unraid.xml
index b2ad02b..d1ab20e 100644
--- a/templates/ts3server_alpine_unraid.xml
+++ b/templates/ts3server_alpine_unraid.xml
@@ -34,7 +34,7 @@ Connect to the server using the TeamSpeak client with the host IP address and po
 To authenticate use the privilege key shown in the supervisord.log file in the /ts3-alpine folder.
 </Description>
   <Beta>False</Beta>
-  <Date>2022-13-13</Date>
+  <Date>2022-06-13</Date>
   <Changes>
 [font size=4][center]teamspeak-alpine[/center][/font]
 [font size=3][b](2019-01-05)[/b][/font]
diff --git a/templates/ts3server_debian_unraid.xml b/templates/ts3server_debian_unraid.xml
index e398747..f6cdd5e 100644
--- a/templates/ts3server_debian_unraid.xml
+++ b/templates/ts3server_debian_unraid.xml
@@ -34,7 +34,7 @@ Connect to the server using the TeamSpeak client with the host IP address and po
 To authenticate use the privilege key shown in the supervisord.log file in the /ts3-debian folder.
 </Description>
   <Beta>False</Beta>
-  <Date>2022-13-13</Date>
+  <Date>2022-06-13</Date>
   <Changes>[font size=4][center]teamspeak-debian[/center][/font]
 [font size=3][b](2019-01-05)[/b][/font]
 &#x00a0;&#x00a0;- changed the way user files are preserved during update process now it is much faster.