diff --git a/README.Rmd b/README.Rmd
index 2e2ab41..1a01687 100644
--- a/README.Rmd
+++ b/README.Rmd
@@ -17,7 +17,11 @@ 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>
 
+<<<<<<< HEAD
 Course collaboration for 202000010. Test branch. 
+=======
+Course collaboration for 202000010
+>>>>>>> Wk4_markup
 
 ---
 
diff --git a/README.md b/README.md
index ff1f6ed..1400565 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,10 @@
 
 # markup 2020 <a href='https://github.com/gerkovink/markup2020'><img src='markup_sticker_SMALL.png' align="right" height="139" /></a>
 
+<<<<<<< HEAD
 Course collaboration for 202000010. Test branch.
+=======
+Course collaboration for 202000010
+>>>>>>> Wk4_markup
 
 -----
diff --git a/add_another_file.txt b/add_another_file.txt
new file mode 100644
index 0000000..d791fdb
--- /dev/null
+++ b/add_another_file.txt
@@ -0,0 +1,2 @@
+      PID    PPID    PGID     WINPID  TTY  UID    STIME COMMAND
+    27764       1   27764      27764  con  500 15:06:51 /usr/msys-ssh-1000-18/ps
diff --git a/laurajochim.txt b/laurajochim.txt
new file mode 100644
index 0000000..e33f5ed
--- /dev/null
+++ b/laurajochim.txt
@@ -0,0 +1,2 @@
+      PID    PPID    PGID     WINPID  TTY  UID    STIME COMMAND
+    28808       1   28808      28808  con  500 15:02:48 /usr/msys-ssh-1000-18/ps