Resolve conflicts

Author: dhruvdutt

src/content/configuration/configuration-languages.md

@@ -26,8 +26,8 @@ and then proceed to write your configuration:
 __webpack.config.ts__
 
 ```typescript
-import * as webpack from 'webpack';
-import * as path from 'path';
+import path from 'path';
+import webpack from 'webpack';
 
 const config: webpack.Configuration = {
   entry: './foo.js',
@@ -40,6 +40,8 @@ const config: webpack.Configuration = {
 export default config;
 ```
 
+Above sample assumes version >= 2.7 or newer of TypeScript is used with the new `esModuleInterop` and `allowSyntheticDefaultImports` compiler options in your `tsconfig.json` file.
+
 Note that you'll also need to check your `tsconfig.json` file. If the module in `compilerOptions` in `tsconfig.json` is `commonjs`, the setting is complete, else webpack will fail with an error. This occurs because `ts-node` does not support any module syntax other than `commonjs`.
 
 There are two solutions to this issue:

src/content/guides/tree-shaking.md

@@ -172,6 +172,8 @@ module.exports = {
 };
 ```
 
+T> Note that the `--optimize-minimize` flag can be used to insert the `UglifyJSPlugin` as well.
+
 With that squared away, we can run another `npm run build` and see if anything has changed.
 
 Notice anything different about `dist/bundle.js`? Clearly the whole bundle is now minified and mangled, but, if you look carefully, you won't see the `square` function included but will see a mangled version of the `cube` function (`function r(e){return e*e*e}n.a=r`). With minification and tree shaking our bundle is now a few bytes smaller! While that may not seem like much in this contrived example, tree shaking can yield a significant decrease in bundle size when working on larger applications with complex dependency trees.