Fix conflicts

Author: andyecrow

packages/react-scripts/config/webpack.config.js

@@ -364,27 +364,14 @@ module.exports = function (webpackEnv) {
                   eslintPath: require.resolve('eslint'),
                   resolvePluginsRelativeTo: __dirname,
                   // @remove-on-eject-begin
-                  ignore: process.env.EXTEND_ESLINT === 'true',
-                  baseConfig: (() => {
-                    // We allow overriding the config only if the env variable is set
-                    if (process.env.EXTEND_ESLINT === 'true') {
-                      const eslintCli = new eslint.CLIEngine();
-                      let eslintConfig;
-                      try {
-                        eslintConfig = eslintCli.getConfigForFile(
-                          paths.appIndexJs
-                        );
-                      } catch (e) {
-                        console.error(e);
-                        process.exit(1);
-                      }
-                      return eslintConfig;
-                    } else {
-                      return {
-                        extends: [require.resolve('eslint-config-react-app')],
-                      };
-                    }
-                  })(),
+                  ignore: isExtendingEslintConfig,
+                  baseConfig: isExtendingEslintConfig
+                  ? undefined
+                  : {
+                    extends: [
+                      require.resolve('eslint-config-react-app'),
+                    ],
+                  },
                   useEslintrc: false,
                   // @remove-on-eject-end
                 },