diff --git a/01/01.txt b/01/01.txt
index 1fc0f81..8495609 100644
--- a/01/01.txt
+++ b/01/01.txt
@@ -1 +1,5 @@
-\c 1 \v 1 \v 2 \v 3 test text
\ No newline at end of file
+<<<<<<< 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
diff --git a/01/04.txt b/01/04.txt
new file mode 100644
index 0000000..9c9052f
--- /dev/null
+++ b/01/04.txt
@@ -0,0 +1 @@
+\v 4 Here is \v 5 some more \v 6 sample text.
\ No newline at end of file
diff --git a/LICENSE.md b/LICENSE.md
index 98f733d..e216a93 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -2,7 +2,11 @@
 # License
 ## Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)
 
+<<<<<<< HEAD
 This is a human-readable summary of (and not a substitute for) the full license found at http://creativecommons.org/licenses/by-sa/4.0/.
+=======
+This is a human-readable summary of (and not a substitute for) the [license](http://creativecommons.org/licenses/by-sa/4.0/).
+>>>>>>> 48f6c818d2f112b3caeba46d111a0d6bca2e43f1
 
 ### You are free to:
 
@@ -25,5 +29,8 @@ The licensor cannot revoke these freedoms as long as you follow the license term
 You do not have to comply with the license for elements of the material in the public domain or where your use is permitted by an applicable exception or limitation.
 
 No warranties are given. The license may not give you all of the permissions necessary for your intended use. For example, other rights such as publicity, privacy, or moral rights may limit how you use the material.
+<<<<<<< HEAD
 
 This PDF was generated using Prince (https://www.princexml.com/).
+=======
+>>>>>>> 48f6c818d2f112b3caeba46d111a0d6bca2e43f1