diff --git a/pack.toml b/pack.toml
index 22b225e..ed6570f 100644
--- a/pack.toml
+++ b/pack.toml
@@ -13,6 +13,4 @@ minecraft = "1.19.2"
 quilt = "0.20.2"
 
 [options]
-
->>>>>>> c9c9b6c (Initial commit)
 datapack-folder = "config/openloader/data"