diff --git a/Cheun.md.txt b/Cheun.md.txt
index 7359e36..26031b8 100644
--- a/Cheun.md.txt
+++ b/Cheun.md.txt
@@ -1,5 +1,4 @@
-<<<<<<< HEAD
 jkerklg,eorfiopefr
-=======
+
 AHAHAHHAHA GOTAGAAAAAAA, alors les gentle mate
 >>>>>>> d6c65328bfa0b5937a6a1944aeafa12e384d5216