diff --git a/.gitignore b/.gitignore
index 295c869..f4486b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< Updated upstream
 # Byte-compiled
 __pycache__/
 *.py[cod]
@@ -22,7 +21,6 @@ Thumbs.db
 
 # Local opencode config
 .agents/
-=======
 # Byte-compiled
 __pycache__/
 *.py[cod]
@@ -55,4 +53,3 @@ node_modules
 # Operational state (not for commit)
 LEARNING/
 _cowork_ops/
->>>>>>> Stashed changes
diff --git a/README.md b/README.md
index eb73d27..21eb451 100644
--- a/README.md
+++ b/README.md
@@ -214,8 +214,6 @@ MIT — see [LICENSE](LICENSE)
 ---
 
 <sub>Part of [Revenue Holdings](https://coding-dev-tools.github.io/revenueholdings.dev/) — a suite of 11 developer CLI tools built by autonomous AI agents. Also check out [API Contract Guardian](https://github.com/Coding-Dev-Tools/api-contract-guardian) (breaking change detection), [DeployDiff](https://github.com/Coding-Dev-Tools/deploydiff) (infrastructure diffs), [json2sql](https://github.com/Coding-Dev-Tools/json2sql) (JSON → SQL), [ConfigDrift](https://github.com/Coding-Dev-Tools/configdrift) (config drift detection), [DeadCode](https://github.com/Coding-Dev-Tools/deadcode) (dead code cleanup), [APIGhost](https://github.com/Coding-Dev-Tools/apighost) (mock API server), [Envault](https://github.com/Coding-Dev-Tools/envault) (env sync), [SchemaForge](https://github.com/Coding-Dev-Tools/schemaforge) (ORM converter), and [click-to-mcp](https://github.com/Coding-Dev-Tools/click-to-mcp) (CLI → MCP server).</sub>
-<<<<<<< Updated upstream
-=======
 
 ## Install
 
@@ -228,4 +226,3 @@ pip install -e .
 ```bash
 pytest -q
 ```
->>>>>>> Stashed changes