diff --git a/manifest b/manifest
index 2d75786..4b2a9f3 100644
--- a/manifest
+++ b/manifest
@@ -2,7 +2,11 @@ const vars = {
     id: "mcjaen2024",
     icon: "https://git.ragestudio.net/srgooglo/jaen-united-2024/raw/branch/main/icon.gif",
     name: "Jaen United Server",
+<<<<<<< Updated upstream
     version: "1.3.3",
+=======
+    version: "1.3.4",
+>>>>>>> Stashed changes
     author: "Jaen United",
     description: "Jaen United Minecraft modpack",
 }