diff --git a/README.md b/README.md
index 8c0cb3d..3bac49d 100644
--- a/README.md
+++ b/README.md
@@ -10,19 +10,13 @@
   <a href="https://www.npmjs.com/package/vue-material">
     <img src="https://img.shields.io/npm/dt/vue-material.svg" alt="Downloads">
   </a>
-<<<<<<< HEAD
 
   <a href="https://www.npmjs.com/package/vue-material">
     <img src="https://img.shields.io/npm/v/vue-material.svg" alt="Version">
-=======
-
-  <a href="https://www.npmjs.com/package/vue-material">
-    <img src="https://img.shields.io/npm/v/vue-material.svg" alt="Version">
-  </a>
+</a>
 
   <a href="https://cdnjs.com/libraries/vue-material">
     <img src="https://img.shields.io/cdnjs/v/vue-material.svg" alt="Version">
->>>>>>> 369f3f0e392dd4fcc2c4e26e80a2e36d6dcf54cd
   </a>
 
   <a href="https://www.npmjs.com/package/vue-material">
diff --git a/package.json b/package.json
index 061879f..78507e1 100644
--- a/package.json
+++ b/package.json
@@ -69,14 +69,9 @@
     "eslint-plugin-html": "^2.0.1",
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.14.1",
-<<<<<<< HEAD
-    "extract-text-webpack-plugin": "beta",
-    "friendly-errors-webpack-plugin": "^1.3.1",
-=======
     "extract-text-webpack-plugin": "^2.1.0",
     "file-loader": "^0.10.0",
     "friendly-errors-webpack-plugin": "^1.1.3",
->>>>>>> 369f3f0e392dd4fcc2c4e26e80a2e36d6dcf54cd
     "highlight.js": "^9.9.0",
     "html-webpack-plugin": "^2.28.0",
     "node-sass": "^4.5.0",