diff --git a/.gitignore b/.gitignore
index d714515..9063c18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -71,7 +71,6 @@ Thumbs.db
 research/
 fixtures/generated/
 .ruff_cache/
-<<<<<<< Updated upstream
 .secrets.baseline
 
 # Merge artifacts and cache (added by workspace stabilization)
@@ -85,8 +84,6 @@ fixtures/generated/
 *.REMOTE.*
 local.db
 *.sqlite3
-=======
 
 # Added by release-prep
 node_modules
->>>>>>> Stashed changes