Resolve conflicts.

Author: odsantos

1-js/03-code-quality/06-polyfills/article.md

@@ -19,11 +19,7 @@ Here Babel comes to the rescue.
 
 Actually, there are two parts in Babel:
 
-<<<<<<< HEAD
-1. First, the transpiler program, which rewrites the code. The developer runs it on their own computer. It rewrites the code into the older standard. And then the code is delivered to the website for users. Modern project build system like [webpack](http://webpack.github.io/) or [brunch](http://brunch.io/) provide means to run transpiler automatically on every code change, so that doesn't involve any time loss from our side.
-=======
 1. First, the transpiler program, which rewrites the code. The developer runs it on their own computer. It rewrites the code into the older standard. And then the code is delivered to the website for users. Modern project build systems like [webpack](http://webpack.github.io/) provide means to run transpiler automatically on every code change, so that it's very easy to integrate into development process.
->>>>>>> e074a5f825a3d10b0c1e5e82561162f75516d7e3
 
 2. Second, the polyfill.