diff --git a/readme.md b/readme.md
index 9d0c62a..7a3bedc 100644
--- a/readme.md
+++ b/readme.md
@@ -1,9 +1,5 @@
 # TinyBlog
-<<<<<<< HEAD
 See it in action: http://ctrl-c.club/~MIF/
-=======
-See it in action: http://ctrl-c.club/~mif
->>>>>>> 7fa2be4b54a81f5dcc088087737266c4ec49a44f
 
 ## Setup
 Make a folder called "posts", and touch files 1 - however many posts you want.