diff --git a/README.Rmd b/README.Rmd
index 2e2ab41..90233a9 100644
--- a/README.Rmd
+++ b/README.Rmd
@@ -17,7 +17,12 @@ options(width = 60, digits = 3)
# markup 2020 
-Course collaboration for 202000010. Test branch.
----
+Course collaboration for 202000010.
+
+You need to solve this conflict in a generic manner such that your classmates can also merge their forked branch into this master branch. So think about a solution on your end.
+
+Gerko
+
+---
diff --git a/README.md b/README.md
index ff1f6ed..9267cae 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,12 @@
# markup 2020
-Course collaboration for 202000010. Test branch.
+Course collaboration for 202000010.
+
+You need to solve this conflict in a generic manner such that your
+classmates can also merge their forked branch into this master branch.
+So think about a solution on your end.
+
+Gerko
-----
diff --git a/add_another_text_file.txt b/add_another_text_file.txt
new file mode 100644
index 0000000..e69de29
diff --git a/jonathankoop.txt b/jonathankoop.txt
new file mode 100644
index 0000000..e69de29