diff --git a/01/01.txt b/01/01.txt
index 8495609..1fc0f81 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\c 1 \v 1 \v 2 \v 3 test text
-=======
-\v 3 \v 1 Here is some example text. \v 2 It is not a translation. Here is some more text. another test from Android 10 and another
->>>>>>> 48f6c818d2f112b3caeba46d111a0d6bca2e43f1
+\c 1 \v 1 \v 2 \v 3 test text
\ No newline at end of file