diff --git a/JustOneThing.md b/JustOneThing.md
index 5e20d80..f14982a 100644
--- a/JustOneThing.md
+++ b/JustOneThing.md
@@ -20,6 +20,9 @@
 **YJHeo**: It would be great to know how to navigate the git in RStudio.  
 **Elizabeth**: I cloned myForkedCopy (with a repository) into my git_class folder (which also has a repository)... do we have to be careful about nesting like that?  
 **Nick**: Why couldn't we get free lunch everyday? :(  
+<<<<<<< HEAD
+**Nick**: Test2  
+**Rebecca**: Sorry I'm late
 **Nick**: Test2 
 **Madeline**: merging changes
 **Wenbo**: Git and GitHub has a step learning curve