diff --git a/lorem.txt b/lorem.txt
index dafb847..40ce372 100644
--- a/lorem.txt
+++ b/lorem.txt
@@ -19,8 +19,12 @@ A different line in base.
 // molestie hendrerit lorem vitae dapibus. In convallis maximus mauris, sit amet hendrerit lectus
 // vulputate ac.
 
+<<<<<<< HEAD
 Another new line.  Conflict time earlier!
 Why isn't this a conflict?
+=======
+Another new line.  Conflict time right now!
+>>>>>>> 5a2f6e2 (Update lorem.txt)
 
 // Aliquam mollis rhoncus diam, nec varius orci tristique in. In accumsan ac lacus sit amet tempor.
 // Etiam iaculis nec libero ac lacinia. Donec finibus, nunc vitae dapibus iaculis, turpis tortor
@@ -30,7 +34,7 @@ Why isn't this a conflict?
 // condimentum purus. Orci varius natoque penatibus et magnis dis parturient montes, nascetur
 // ridiculus mus. Praesent vitae augue et sapien egestas ultrices. Vestibulum ac posuere lectus,
 // vitae semper dui. Integer fermentum nec nulla eget aliquet. Fusce vitae tortor hendrerit, maximus
-// ipsum id, fringilla mi.
+// ipsum id, fringilla miiii.
 
 Something something blah blah blah.  And more blahssss.