diff --git a/Cargo.lock b/Cargo.lock
index 549a27d5..0811af7f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5258,11 +5258,8 @@ dependencies = [
  "rand 0.8.5",
  "regex",
  "reqwest 0.12.28",
-<<<<<<< Updated upstream
- "ruvector-consciousness",
-=======
  "rusqlite",
->>>>>>> Stashed changes
+ "ruvector-consciousness",
  "ruvector-delta-core",
  "ruvector-domain-expansion",
  "ruvector-mincut 2.1.0",
diff --git a/crates/mcp-brain-server/Cargo.toml b/crates/mcp-brain-server/Cargo.toml
index b9b5cc20..0db16848 100644
--- a/crates/mcp-brain-server/Cargo.toml
+++ b/crates/mcp-brain-server/Cargo.toml
@@ -13,18 +13,17 @@ name = "mcp-brain-server"
 path = "src/main.rs"
 
 [[bin]]
-<<<<<<< Updated upstream
 name = "ruvbrain-sse"
 path = "src/bin/ruvbrain_sse.rs"
 
 [[bin]]
 name = "ruvbrain-worker"
 path = "src/bin/ruvbrain_worker.rs"
-=======
+
+[[bin]]
 name = "mcp-brain-server-local"
 path = "src/bin/local.rs"
 required-features = ["local"]
->>>>>>> Stashed changes
 
 [dependencies]
 # Web framework