diff --git a/src/tp1.R b/src/tp1.R
index 44b14f311b1cadf89e0651bbdabe4c9b3cef90dc..0b817608319de624e0341591b7bfab4ae1578d44 100644
--- a/src/tp1.R
+++ b/src/tp1.R
@@ -2,6 +2,7 @@ options(repos = c(CRAN = "https://cloud.r-project.org"))
 output_dir = "results/tp1"
 dir.create(output_dir, showWarnings = F, recursive = T)
 
+<<<<<<< HEAD
 # if (!require("BiocManager", quietly = TRUE))
 #  install.packages("BiocManager")
 
@@ -17,6 +18,8 @@ dir.create(output_dir, showWarnings = F, recursive = T)
 #library(devtools)
 #library(plyr)
 
+=======
+>>>>>>> main
 # Les données analysées nécessitant beaucoup de RAM, nous allons sélectionner aléatoirement 250000 SNPs et réecrire des fichiers bed, bim, fam
 penncath_bed_path = "results/data/penncath.bed"
 penncath_bim_path = "results/data/penncath.bim"
@@ -43,3 +46,8 @@ rm(geno)
 rdata_path = file.path(output_dir, "TP1_asbvg.RData")
 save.image(rdata_path)
 
+<<<<<<< HEAD
+=======
+
+
+>>>>>>> main