diff --git a/.gitignore b/.gitignore
index a0c5a8a6e967d98e398580528c1ae278c31deed9..3750c7e67b22c6fba8b2970aade44fad475c78b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
 /0-collect-data/personnal-keys.json
 /0-collect-data/bso/
+<<<<<<< Updated upstream
 /1-enrich-with-datacite/__pycache__/
 
+=======
+/1-enrich-with-datacite/__pycache__
+>>>>>>> Stashed changes
 
 /hide
\ No newline at end of file