diff --git a/README.md b/README.md
index 2af4a2a53a..cd834f9c2f 100644
--- a/README.md
+++ b/README.md
@@ -116,8 +116,6 @@ Then pass this file's name to dream.py when you invoke it:
 (ldm) ~/stable-diffusion$ python3 scripts/dream.py --from_file="path/to/prompts.txt"
 ~~~~
 
->>>>>>> big-refactoring
-
 ## Weighted Prompts
 
 You may weight different sections of the prompt to tell the sampler to attach different levels of