diff --git a/README.md b/README.md
index b266245..14d9537 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # justin.deal
 
 My personal website and blog.