diff --git a/readme.md b/readme.md
index 7f6d5b1..fe2099d 100644
--- a/readme.md
+++ b/readme.md
@@ -61,3 +61,8 @@ python main --prompt-file path/to/prompt.txt
 ```
 
 
+<<<<<<< Updated upstream
+asdf22
+=======
+.
+>>>>>>> Stashed changes