diff --git a/.gitignore b/.gitignore
index 1b50b83..df5f869 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,12 +23,9 @@ dist-ssr
 *.sln
 *.sw?
 
-<<<<<<< HEAD
 .claude
-=======
 # Variables d'environnement Brevo
 api/.env
 
 # Guide d'intégration (contient des informations sensibles)
 GUIDE-INTEGRATION-MONDIAL-RELAY.md
->>>>>>> 2f3af0e (product images : use first image as cover, integrate gallery structure and preserve files sorting)