fix conflicts

Author: marcosmoura

build/webpack/dev.js

@@ -10,11 +10,7 @@ Object.keys(baseWebpackConfig.entry).forEach((name) => {
 });
 
 export default merge(baseWebpackConfig, {
-<<<<<<< HEAD
-  devtool: '#eval-source-map',
-=======
   devtool: 'cheap-module-eval-source-map',
->>>>>>> origin/develop
   module: {
     rules: [
       {