fix conflicts

Author: jamesbt365

Cargo.toml

@@ -12,8 +12,8 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
 
 # Discord API
-poise = "0.6.1"
-serenity = {version = "0.12", default-features = false, features = ["cache", "client", "gateway", "rustls_backend", "model", "framework", "standard_framework"] }
+poise = "0.6"
+serenity = "0.12"
 tokio = { version = "1.29.1", features = ["macros", "signal", "rt-multi-thread"] }
 
 # Misc