diff --git a/.gitignore b/.gitignore
index 21c7a5b..312a43b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,11 @@ node_modules/
 */node_modules/
 **/node_modules/
 */build/
+<<<<<<< Updated upstream
 package-lock.json
 CLAUDE.md
-.claude/
\ No newline at end of file
+.claude/
+=======
+.claude
+CLAUDE.md
+>>>>>>> Stashed changes