diff --git a/bower.json b/bower.json
index ff70611..436a2cf 100644
--- a/bower.json
+++ b/bower.json
@@ -1,11 +1,7 @@
 {
   "name": "thrift",
-<<<<<<< HEAD
+  "version": "1.0.0",
   "homepage": "https://github.com/apache/thrift.git",
-=======
-  "version": "0.12.0",
-  "homepage": "https://git-wip-us.apache.org/repos/asf/thrift.git",
->>>>>>> origin/0.12.0
   "authors": [
     "Apache Thrift <dev@thrift.apache.org>"
   ],