diff --git a/.gitignore b/.gitignore
index c0c3462c..d8a7e544 100644
--- a/.gitignore
+++ b/.gitignore
@@ -328,11 +328,5 @@ tmp/
 # Claude MEMORY directory
 MEMORY/
 
-<<<<<<< HEAD
 # Maestro artifacts
 .maestro
-
-=======
-# Maestro directory
-.maestro/
->>>>>>> main