merge completed... now to fix all the bugs...

node_modules/eslint-plugin-import/config/react.js

@@ -0,0 +1,18 @@
+/**
+ * Adds `.jsx` as an extension, and enables JSX parsing.
+ *
+ * Even if _you_ aren't using JSX (or .jsx) directly, if your dependencies
+ * define jsnext:main and have JSX internally, you may run into problems
+ * if you don't enable these settings at the top level.
+ */
+module.exports = {
+
+  settings: {
+    'import/extensions': ['.js', '.jsx'],
+  },
+
+  parserOptions: {
+    ecmaFeatures: { jsx: true },
+  },
+
+};