diff --git a/docs/package.json b/docs/package.json
index 0119839986..27a26be09a 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,10 +1,6 @@
 {
   "name": "@ionic/docs",
-<<<<<<< HEAD
   "version": "6.0.0-beta.0",
-=======
-  "version": "5.6.11",
->>>>>>> origin/master
   "description": "Pre-packaged API documentation for the Ionic docs.",
   "main": "core.json",
   "types": "core.d.ts",