diff --git a/Gabriel.txt.txt b/Gabriel.txt.txt
index a680d22..09d4d22 100644
--- a/Gabriel.txt.txt
+++ b/Gabriel.txt.txt
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
 LA KPOP C'EST NUL
-=======
 cours github expernet
->>>>>>> 8331ff78dd43c2c192752092ee9a1a70218f6a32
+
diff --git a/toma.txt b/toma.txt
index c80aa75..835024a 100644
--- a/toma.txt
+++ b/toma.txt
@@ -1 +1,3 @@
+
+Add Text Ludovic 2.
 Add Tefto Ludovic.