diff --git a/package.json b/package.json
index 4305926..151e33f 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "pg",
-<<<<<<< HEAD
-  "version": "0.15.1",
-=======
   "version": "1.0.0",
->>>>>>> v1.0
   "description": "PostgreSQL client - pure javascript & libpq with the same API",
   "keywords": [
     "postgres",