diff --git a/package.json b/package.json
index 6504ce5167..640e2df0c6 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "ember-cli",
-<<<<<<< HEAD
   "version": "4.0.0-beta.1",
-=======
-  "version": "3.28.2",
->>>>>>> origin/release
   "description": "Command line tool for developing ambitious ember.js apps",
   "keywords": [
     "app",