diff --git a/.gitignore b/.gitignore
index 9a388ac..00ba4b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -187,4 +187,3 @@ anon_new.session-journal
 
 # Claude Desktop config
 claude_desktop_config.json
->>>>>>> 34256575c5ccd1cfa8bf8cf577bfa4fd48429904