diff --git a/README.md b/README.md
index bf379d4..2c7e8a6 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 I wanted to create an "app" that would read in JSON and print out the results randomly based on a randomly generated number. It took me a while to get right, mostly because of the JSON file format. I have it down now. This is my result.
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 ## Next steps ...
 
@@ -20,3 +21,6 @@ I managed to get the looping done with a iteration count of 25 and an interval o
 ## Changed the entire format of the page
 
 I didn't like that the looping would repeat the same quote several times so I decided on a column format instead. This way **all** the quotes show up at once. No looping, no excessive animations ... just a simple page.
+=======
+--  18 May, 2022; 00:13:59
+>>>>>>> 49a8d5d (Update README)