diff --git a/README.md b/README.md
index 3c76a3b..75775e0 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 
 I didn't like the available World of Darkness Mage character sheets, so I made my own
 
-<<<<<<< HEAD
 [PDFs are here](https://files.daviddaily.dev/LaTeX/WoD/)
 
 Individual ones:
@@ -10,7 +9,4 @@ Individual ones:
 
 [Joe](https://files.daviddaily.dev/LaTeX/WoD/Joe.pdf)
 
-[Jake](https://files.daviddaily.dev/LaTeX/WoD/Jake.pdf)
-=======
-All the PDFs get dumped [here](https://files.daviddaily.dev/Character%20Sheet/)
->>>>>>> f58ff6ab71df8d8c922893bd8c74469c9126d888
+[Jake](https://files.daviddaily.dev/LaTeX/WoD/Jake.pdf)
\ No newline at end of file