diff --git a/package.json b/package.json
index dfaf8d9..54b8c5e 100644
--- a/package.json
+++ b/package.json
@@ -7,12 +7,7 @@
     "start": "node server",
     "server": "nodemon server",
     "client": "npm start --prefix client --trace-depracation",
-<<<<<<< HEAD
     "dev": "concurrently \"npm run server\" \"npm run client\""
-=======
-    "dev": "concurrently \"npm run server\" \"npm run client\"",
-    "heroku-postbuild":"NPM_CONFIG_PRODUCTION=false npm install --prefix client && npm run build --prefix client"
->>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
   },
   "author": "",
   "license": "ISC",