diff --git a/rust/crates/commands/src/lib.rs b/rust/crates/commands/src/lib.rs
index 411c0219..31c09173 100644
--- a/rust/crates/commands/src/lib.rs
+++ b/rust/crates/commands/src/lib.rs
@@ -5425,9 +5425,12 @@ pub fn handle_slash_command(
         | SlashCommand::Setup
 =======
         | SlashCommand::Lsp { .. }
+<<<<<<< HEAD
         | SlashCommand::Setup
         | SlashCommand::Unknown(_) => None,
 >>>>>>> e9582034 (feat: full LSP (Language Server Protocol) integration)
+=======
+>>>>>>> 0b227b62 (fix: resolve cherry-pick conflicts and remove non-LSP artifacts)
         | SlashCommand::Unknown(_) => None,
     }
 }
diff --git a/rust/crates/runtime/src/config_validate.rs b/rust/crates/runtime/src/config_validate.rs
index 6de6a272..525e8c14 100644
--- a/rust/crates/runtime/src/config_validate.rs
+++ b/rust/crates/runtime/src/config_validate.rs
@@ -355,24 +355,6 @@ const OAUTH_FIELDS: &[FieldSpec] = &[
     },
 ];
 
-const PROVIDER_FIELDS: &[FieldSpec] = &[
-    FieldSpec {
-        name: "kind",
-        expected: FieldType::String,
-    },
-    FieldSpec {
-        name: "apiKey",
-        expected: FieldType::String,
-    },
-    FieldSpec {
-        name: "baseUrl",
-        expected: FieldType::String,
-    },
-    FieldSpec {
-        name: "model",
-        expected: FieldType::String,
-    },
-];
 
 const LSP_FIELDS: &[FieldSpec] = &[
     FieldSpec {
diff --git a/rust/crates/runtime/src/lib.rs b/rust/crates/runtime/src/lib.rs
index f7b109ea..db21af34 100644
--- a/rust/crates/runtime/src/lib.rs
+++ b/rust/crates/runtime/src/lib.rs
@@ -71,6 +71,7 @@ pub use compact::{
 pub use config::{
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     clear_user_provider_settings, default_config_home, save_user_provider_settings,
     suppress_config_warnings_for_json_mode, ApiTimeoutConfig, ConfigEntry, ConfigError,
@@ -85,6 +86,9 @@ pub use config::{
 =======
 >>>>>>> e9582034 (feat: full LSP (Language Server Protocol) integration)
     clear_user_provider_settings, save_user_provider_settings, ConfigEntry, ConfigError,
+=======
+    ConfigEntry, ConfigError,
+>>>>>>> 0b227b62 (fix: resolve cherry-pick conflicts and remove non-LSP artifacts)
     ConfigLoader, ConfigSource, LspServerConfig, McpConfigCollection, McpManagedProxyServerConfig,
     McpOAuthConfig, McpRemoteServerConfig, McpSdkServerConfig, McpServerConfig,
     McpStdioServerConfig, McpTransport, McpWebSocketServerConfig, OAuthConfig,
diff --git a/rust/crates/runtime/src/sandbox.rs b/rust/crates/runtime/src/sandbox.rs
index 2df08791..62c7c7e4 100644
--- a/rust/crates/runtime/src/sandbox.rs
+++ b/rust/crates/runtime/src/sandbox.rs
@@ -298,7 +298,11 @@ fn unshare_user_namespace_works() -> bool {
             .stdout(std::process::Stdio::null())
             .stderr(std::process::Stdio::null())
             .status()
+<<<<<<< HEAD
             .is_ok_and(|status| status.success())
+=======
+            .is_ok_and(|s| s.success())
+>>>>>>> 0b227b62 (fix: resolve cherry-pick conflicts and remove non-LSP artifacts)
     })
 }
 
diff --git a/rust/crates/rusty-claude-cli/src/main.rs b/rust/crates/rusty-claude-cli/src/main.rs
index 4ac4786c..7ba81bf5 100644
--- a/rust/crates/rusty-claude-cli/src/main.rs
+++ b/rust/crates/rusty-claude-cli/src/main.rs
@@ -6925,6 +6925,7 @@ fn run_resume_command(
         | SlashCommand::Ide { .. }
         | SlashCommand::Tag { .. }
         | SlashCommand::OutputStyle { .. }
+<<<<<<< HEAD
 <<<<<<< HEAD
         | SlashCommand::AddDir { .. }
 <<<<<<< HEAD
@@ -6938,6 +6939,10 @@ fn run_resume_command(
         | SlashCommand::Lsp { .. }
 >>>>>>> e9582034 (feat: full LSP (Language Server Protocol) integration)
         | SlashCommand::Setup => Err("unsupported resumed slash command".into()),
+=======
+        | SlashCommand::AddDir { .. }
+        | SlashCommand::Lsp { .. } => Err("unsupported resumed slash command".into()),
+>>>>>>> 0b227b62 (fix: resolve cherry-pick conflicts and remove non-LSP artifacts)
     }
 }