diff --git a/README.md b/README.md
index eb8faa2..f4e64de 100644
--- a/README.md
+++ b/README.md
@@ -10,4 +10,11 @@ Apple pie pastry lemon drops chupa chups toffee tiramisu pudding gingerbread. Br
 
 ### Lorem ipsum
 
-Carrot cake lollipop chocolate bar liquorice chocolate jelly beans apple pie muffin jelly. Donut fruitcake danish pie danish.
\ No newline at end of file
+Carrot cake lollipop chocolate bar liquorice chocolate jelly beans apple pie muffin jelly. Donut fruitcake danish pie danish.
+
+<<<<<<< Updated upstream
+
+Ahoy matey, yar lorem ipsum text is awash with brigands, bilge and more. Get swashbuckling with this trendy looking pirate placeholder text generator.
+=======
+Björn: Ahoy matey, yar lorem ipsum text is awash with brigands, bilge and more. Get swashbuckling with this trendy looking pirate placeholder text generator.
+>>>>>>> Stashed changes