diff --git a/mod.json b/mod.json
index 656c1b8..e5f8ec1 100644
--- a/mod.json
+++ b/mod.json
@@ -1,5 +1,9 @@
 {
+<<<<<<< Updated upstream
 	"geode": "2.0.0-beta.26",
+=======
+	"geode": "3.0.0-beta.1",
+>>>>>>> Stashed changes
 	"gd": {
 		"android": "2.205",
 		"win": "2.204"