diff --git a/manifest b/manifest
index 4b2a9f3..a0639a9 100644
--- a/manifest
+++ b/manifest
@@ -2,11 +2,7 @@ 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",
 }