diff --git a/package.json b/package.json
index 2caa513a..21eeadce 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,7 @@
 {
   "name": "realm",
   "description": "Realm is a mobile database: an alternative to SQLite and key-value stores",
-<<<<<<< HEAD
   "version": "2.0.0-rc5",
-=======
-  "version": "1.11.1",
->>>>>>> 38bceddfb19fd9f8ac5cc62ddb8bfa626270aa5c
   "license": "Apache-2.0",
   "homepage": "https://realm.io",
   "keywords": [