merge

package.json

@@ -51,10 +51,7 @@
     "husky": "^0.12.0",
     "redbox-react": "^1.4.3",
     "roadhog": "^2.5.0-beta.1",
-<<<<<<< HEAD
     "uglifyjs-webpack-plugin": "^1.0.0-rc.0",
-=======
->>>>>>> 737790d32d174a62e39370192a167afbc80ff07d
     "webpack": "^4.29.6",
     "webpack-cli": "^3.3.0"
   }