diff --git a/Cheun.md.txt b/Cheun.md.txt
index a4ff0fb..7359e36 100644
--- a/Cheun.md.txt
+++ b/Cheun.md.txt
@@ -1 +1,5 @@
-AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mate
\ No newline at end of file
+<<<<<<< HEAD
+jkerklg,eorfiopefr
+=======
+AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mate
+>>>>>>> d6c65328bfa0b5937a6a1944aeafa12e384d5216
diff --git a/toma.txt b/toma.txt
index c9f390e..c80aa75 100644
--- a/toma.txt
+++ b/toma.txt
@@ -1 +1 @@
-Add Text Ludovic.
+Add Tefto Ludovic.