gerkovink · jonathankoop · Jan 17, 2025 · Jan 17, 2025 · Jan 17, 2025 · Jan 17, 2025
diff --git a/README.Rmd b/README.Rmd
@@ -17,7 +17,12 @@ options(width = 60, digits = 3)
 
 # markup 2020 <a href='https://github.com/gerkovink/markup2020'><img src='markup_sticker_SMALL.png' align="right" height="139" /></a>
 
-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
@@ -2,6 +2,12 @@
 
 # markup 2020 <a href='https://github.com/gerkovink/markup2020'><img src='markup_sticker_SMALL.png' align="right" height="139" /></a>
 
-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
diff --git a/jonathankoop.txt b/jonathankoop.txt