diff --git a/README.md b/README.md
index df894dc..8cd0c14 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,5 @@
 # fairyfloss theme
 
 ![theme logo](http://sailorhg.github.io/fairyfloss/fairyfloss.png)
-<<<<<<< HEAD
-=======
 
->>>>>>> e02c4f3f70754f0233e5aab5ac9278bacb3c4ddf
 ![theme screenshot](http://sailorhg.github.io/fairyfloss/code.png)