diff --git a/pack.toml b/pack.toml
index ff082b2..8f6ed85 100644
--- a/pack.toml
+++ b/pack.toml
@@ -6,19 +6,11 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-<<<<<<< HEAD
-hash = "0e47cbb1502553e3c228c4b401a36bbf217599d2b4ad2c14c8caa0b0541d0143"
+hash = "924dd366642244fa42fd49948b3016d3a2ddf2eb170d6a01f1662a6b28958f8a"
 
 [versions]
 fabric = "0.14.7"
 minecraft = "1.18.1"
-=======
-hash = "468e3e6ca7b5d8713df8512b768aa87651ed23b137e170d5b56f831efa71c9f1"
-
-[versions]
-fabric = "0.14.4"
-minecraft = "1.18.2"
->>>>>>> c4d1261 (1.18.2!!!)
 
 [options]
 acceptable-game-versions = ["1.18.2"]