diff --git a/Jeremy.txt b/Jeremy.txt
index 44df257..d3a63b8 100644
--- a/Jeremy.txt
+++ b/Jeremy.txt
@@ -1 +1,5 @@
-poney unijambiste
\ No newline at end of file
+<<<<<<< HEAD
+C'est une bonne situation ça scribe ?
+=======
+poney unijambiste
+>>>>>>> 8331ff78dd43c2c192752092ee9a1a70218f6a32
diff --git a/sgg.txt b/sgg.txt
index add0009..04baf3f 100644
--- a/sgg.txt
+++ b/sgg.txt
@@ -1,2 +1 @@
-SG le best
 aled
\ No newline at end of file
diff --git a/toma.txt b/toma.txt
index fa7174b..a8a5b10 100644
--- a/toma.txt
+++ b/toma.txt
@@ -1 +1 @@
-Toma
+AZylos