diff --git a/.gitignore b/.gitignore
index 7b88789e..97ef0478 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,10 @@ pi-*.html
 out.html
 packages/coding-agent/binaries/
 todo.md
+<<<<<<< Updated upstream
 
 # Riptide artifacts (cloud-synced)
 .humanlayer/tasks/
+=======
+.humanlayer
+>>>>>>> Stashed changes