diff --git a/README.md b/README.md
index 28d0fa7c970..27c0149aac2 100644
--- a/README.md
+++ b/README.md
@@ -79,8 +79,6 @@ Thanks to the following people who have submitted major pull requests:
 - [@cvkef](https://github.com/cvkef)
 
 Also, thanks to [Sauce Labs](http://saucelabs.com) for sponsoring the development of the responsive styles.
-<<<<<<< HEAD
-=======
 
 Special Thanks
 --------------------
@@ -88,4 +86,3 @@ Special Thanks
 - [middleman-syntax](https://github.com/middleman/middleman-syntax)
 - [middleman-gh-pages](https://github.com/edgecase/middleman-gh-pages)
 - [Font Awesome](http://fortawesome.github.io/Font-Awesome/)
->>>>>>> Update JavaScript dependencies (#1248)