From 3cc36e24892393abd2bb5feafca80086067f5cd3 Mon Sep 17 00:00:00 2001
From: ruvnet <ruvnet@gmail.com>
Date: Mon, 20 Apr 2026 13:14:11 -0400
Subject: [PATCH] fix(brain): resolve merge conflict markers in Cargo.toml and
 Cargo.lock

Unresolved <<<<<<< / ======= / >>>>>>> markers blocked all CI
(cargo check, clippy, rustfmt, tests, security audit, native builds).

Keep both sides: ruvbrain-sse + ruvbrain-worker bins from upstream
and the new mcp-brain-server-local bin from this branch. Lock file
retains both ruvector-consciousness and rusqlite dependencies.

Co-Authored-By: claude-flow <ruv@ruv.net>
---
 Cargo.lock                         | 5 +----
 crates/mcp-brain-server/Cargo.toml | 5 ++---
 2 files changed, 3 insertions(+), 7 deletions(-)

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