diff --git a/modpacks/re-console-plus/cf/yarn/1.21.10-fabric/pack.toml b/modpacks/re-console-plus/cf/yarn/1.21.10-fabric/pack.toml
index 7c73c42f8..69b8f0b7f 100644
--- a/modpacks/re-console-plus/cf/yarn/1.21.10-fabric/pack.toml
+++ b/modpacks/re-console-plus/cf/yarn/1.21.10-fabric/pack.toml
@@ -6,11 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-<<<<<<< HEAD
 hash = "baea488c557c9ac37c81ea2e6d0723695c5353f4a445248546d2b60f9ae51bd7"
-=======
-hash = "26b0d0dac47e2467425930833419f582d7a933d2fb2bb3b0c3ac198144c5570f"
->>>>>>> 3750aad61551408bd5ad4fe60631e097fcdcb082
 
 [versions]
 fabric = "0.18.5"
diff --git a/modpacks/re-console-plus/mr/yarn/1.21.10-fabric/pack.toml b/modpacks/re-console-plus/mr/yarn/1.21.10-fabric/pack.toml
index 83e20ea8e..733f09718 100644
--- a/modpacks/re-console-plus/mr/yarn/1.21.10-fabric/pack.toml
+++ b/modpacks/re-console-plus/mr/yarn/1.21.10-fabric/pack.toml
@@ -6,11 +6,7 @@ pack-format = "packwiz:1.1.0"
 [index]
 file = "index.toml"
 hash-format = "sha256"
-<<<<<<< HEAD
-hash = "4934b5743212322c8883b0698300d09a827f9e8f29ec56548ebe99ab8f5cb7ac"
-=======
 hash = "95ad328c3288f210f1cc13f1ecf8185229746623d5f4152a515419cf0f7b069e"
->>>>>>> 3750aad61551408bd5ad4fe60631e097fcdcb082
 
 [versions]
 fabric = "0.18.5"