diff --git a/pack.toml b/pack.toml
index 34ffba2..c5d0fa4 100644
--- a/pack.toml
+++ b/pack.toml
@@ -6,11 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-<<<<<<< HEAD
-hash = "8d35fd364bf4304265646d0fd2f55d523a07d823d4615b99137714246767511b"
-=======
-hash = "7b0dd7fed9fb1ff9ecc0316ba27d30e8ab545ecf974f974b97ef3dcf6072a978"
->>>>>>> 2515d32 (Usunięcie palladium - poprawa minecolonies, update modów)
+hash = "cd0d38f1a6c1710739b435a9f69030f7033299267781f6aa511b53f140b7c3a7"
 
 [versions]
 minecraft = "1.21.1"