diff --git a/Gabriel.txt.txt b/Gabriel.txt.txt
index 58b770f..a680d22 100644
--- a/Gabriel.txt.txt
+++ b/Gabriel.txt.txt
@@ -1 +1,5 @@
-cours github expernet
\ No newline at end of file
+<<<<<<< HEAD
+LA KPOP C'EST NUL
+=======
+cours github expernet
+>>>>>>> 8331ff78dd43c2c192752092ee9a1a70218f6a32
diff --git a/Thomy.txt b/Thomy.txt
index 8e702b6..cbddc01 100644
--- a/Thomy.txt
+++ b/Thomy.txt
@@ -1 +1 @@
-Test push github
\ No newline at end of file
+tomy j'ai pirater ton fichier texte
\ No newline at end of file