diff --git a/workflows/makefile_ex b/workflows/makefile_ex
index 725d64c245ab14d7b1970bc0f7c6150111b37f85..e357fb1296fabc4b47ce025d665961334eaa85e9 100644
--- a/workflows/makefile_ex
+++ b/workflows/makefile_ex
@@ -5,14 +5,7 @@ run_tp2: results/data/penncath.bim results/data/penncath.bed results/data/pennca
 
 # Générer les fichiers penncath.bim, penncath.bed et penncath.fam en exécutant download_data.R
 results/data/penncath.bim results/data/penncath.bed results/data/penncath.fam:
-<<<<<<< HEAD
 	Rscript sources/download_data.R  
-=======
-	Rscript sources/download_data.R  # Ceci aussi doit commencer par une tabulation
-	
-	
-	
-	   
->>>>>>> release/0.1.0
+