diff --git a/.gitignore b/.gitignore
index 3750c7e67b22c6fba8b2970aade44fad475c78b5..73ed0337ed54747934b01503be692fa1aa1078f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,5 @@
 /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