diff --git a/bower.json b/bower.json
index c72a6b3..0de36a7 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,11 @@
 {
   "name": "devicons",
   "description": "Devicons - An icon font made for developers",
+<<<<<<< HEAD
   "version": "1.3",
+=======
+  "version": "1.2",
+>>>>>>> 62b77bdd8cfc4106088d8d9e9006af8cb4883c11
   "keywords": [
     "icons",
     "devicons",