diff --git a/libs/ddd/src/schematics/domain/index.ts b/libs/ddd/src/schematics/domain/index.ts
index 5251535..5ced65a 100644
--- a/libs/ddd/src/schematics/domain/index.ts
+++ b/libs/ddd/src/schematics/domain/index.ts
@@ -17,17 +17,19 @@ import {
   addNgrxImportsToApp,
   addNgRxToPackageJson,
 } from '../rules';
+import { readNxWorkspaceLayout } from '../utils';
 
 export default function (options: DomainOptions): Rule {
   const libFolder = strings.dasherize(options.name);
+  const { libsDir, appsDir } = readNxWorkspaceLayout();
 
   const templateSource = apply(url('./files'), [
     template({}),
-    move(`libs/${libFolder}/domain/src/lib`),
+    move(`${libsDir}/${libFolder}/domain/src/lib`),
   ]);
 
   const appFolderName = strings.dasherize(options.name);
-  const appPath = `apps/${appFolderName}/src/app`;
+  const appPath = `${appsDir}/${appFolderName}/src/app`;
   const appModulePath = `${appPath}/app.module.ts`;
 
   if (options.ngrx && !options.addApp) {
diff --git a/libs/ddd/src/schematics/feature/index.ts b/libs/ddd/src/schematics/feature/index.ts
index 01f14c0..0f963b1 100644
--- a/libs/ddd/src/schematics/feature/index.ts
+++ b/libs/ddd/src/schematics/feature/index.ts
@@ -21,29 +21,31 @@ import {
   addNgrxImportsToDomain,
   addNgRxToPackageJson,
 } from '../rules';
-import { readWorkspaceName } from '../utils';
+import { readWorkspaceName, readWorkspaceLayout } from '../utils';
 
 export default function (options: FeatureOptions): Rule {
   return (host: Tree) => {
     const workspaceName = readWorkspaceName(host);
+    const workspaceLayout = readWorkspaceLayout(host);
 
+    const { libsDir, appsDir } = workspaceLayout;
     const domainFolderName = strings.dasherize(options.domain);
-    const domainPath = `libs/${domainFolderName}/domain/src/lib`;
+    const domainPath = `${libsDir}/${domainFolderName}/domain/src/lib`;
     const domainModulePath = `${domainPath}/${domainFolderName}-domain.module.ts`;
     const domainModuleClassName =
       strings.classify(options.domain) + 'DomainModule';
     const domainImportPath = `${workspaceName}/${domainFolderName}/domain`;
-    const domainIndexPath = `libs/${domainFolderName}/domain/src/index.ts`;
+    const domainIndexPath = `${libsDir}/${domainFolderName}/domain/src/index.ts`;
 
     const featureName = strings.dasherize(options.name);
     const featureFolderName = (options.prefix ? 'feature-' : '') + featureName;
-    const featurePath = `libs/${domainFolderName}/${featureFolderName}/src/lib`;
+    const featurePath = `${libsDir}/${domainFolderName}/${featureFolderName}/src/lib`;
     const featureModulePath = `${featurePath}/${domainFolderName}-${featureFolderName}.module.ts`;
     const featureModuleClassName = strings.classify(
       `${options.domain}-${featureFolderName}Module`
     );
     const featureImportPath = `${workspaceName}/${domainFolderName}/${featureFolderName}`;
-    const featureIndexPath = `libs/${domainFolderName}/${featureFolderName}/src/index.ts`;
+    const featureIndexPath = `${libsDir}/${domainFolderName}/${featureFolderName}/src/index.ts`;
 
     const entityName = options.entity ? strings.dasherize(options.entity) : '';
 
@@ -54,10 +56,10 @@ export default function (options: FeatureOptions): Rule {
 
     const appName = options.app || options.domain;
     const appFolderName = strings.dasherize(appName);
-    const appModulePath = `apps/${appFolderName}/src/app/app.module.ts`;
+    const appModulePath = `${appsDir}/${appFolderName}/src/app/app.module.ts`;
 
     if (options.app) {
-      const requiredAppModulePath = `apps/${appFolderName}/src/app/app.module.ts`;
+      const requiredAppModulePath = `${appsDir}/${appFolderName}/src/app/app.module.ts`;
       if (!host.exists(requiredAppModulePath)) {
         throw new Error(
           `Specified app ${options.app} does not exist: ${requiredAppModulePath} expected!`
diff --git a/libs/ddd/src/schematics/utils/index.ts b/libs/ddd/src/schematics/utils/index.ts
index 343249e..78b5e0c 100644
--- a/libs/ddd/src/schematics/utils/index.ts
+++ b/libs/ddd/src/schematics/utils/index.ts
@@ -1,3 +1,4 @@
+export * from './read-workspace-layout';
 export * from './read-into-source-file';
 export * from './check-rule-exists';
 export * from './read-workspace-name';
diff --git a/libs/ddd/src/schematics/utils/read-workspace-layout.ts b/libs/ddd/src/schematics/utils/read-workspace-layout.ts
new file mode 100644
index 0000000..c555ca8
--- /dev/null
+++ b/libs/ddd/src/schematics/utils/read-workspace-layout.ts
@@ -0,0 +1,32 @@
+import { Tree } from '@angular-devkit/schematics';
+import { readJsonFile } from '@nrwl/workspace';
+
+export interface WorkspaceLayout {
+  appsDir: boolean;
+  libsDir: boolean;
+}
+
+/**
+ * readWorkspaceLayout
+ * @param host host provided to a rule
+ */
+export function readWorkspaceLayout(host: Tree): WorkspaceLayout {
+  const content = host.read('nx.json').toString();
+  const config = JSON.parse(content);
+  return (
+    config['workspaceLayout'] ?? {
+      appsDir: 'apps',
+      libsDir: 'libs',
+    }
+  );
+}
+
+export function readNxWorkspaceLayout(): WorkspaceLayout {
+  const config = readJsonFile('nx.json')
+  return (
+    config['workspaceLayout'] ?? {
+      appsDir: 'apps',
+      libsDir: 'libs',
+    }
+  );
+}
diff --git a/package-lock.json b/package-lock.json
index 4c3af31..3fe27b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,34 +5,19 @@
   "requires": true,
   "dependencies": {
     "@angular-devkit/architect": {
-<<<<<<< HEAD
-      "version": "0.1000.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.6.tgz",
-      "integrity": "sha512-IZ8yiiW+LQ5mI3VbNHzisTIn0j6D1inQZgcZtc5W2A7fFNvBlIh6vGU3mB6Qvg678Gt6tlvnNT6/R9A9Ct7VnA==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/core": "10.0.6",
-=======
       "version": "0.1000.8",
       "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz",
       "integrity": "sha512-2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA==",
       "dev": true,
       "requires": {
         "@angular-devkit/core": "10.0.8",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "rxjs": "6.5.5"
       },
       "dependencies": {
         "@angular-devkit/core": {
-<<<<<<< HEAD
-          "version": "10.0.6",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.6.tgz",
-          "integrity": "sha512-mVvqSEoeErZ7bAModk95EAa6R9Nl23rvX+/TXuKVTK2dziMFBOrwHjb1DYhnZxFIH4xfUftCx+BWHjXBXCPYlA==",
-=======
           "version": "10.0.8",
           "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
           "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
           "dev": true,
           "requires": {
             "ajv": "6.12.3",
@@ -41,28 +26,10 @@
             "rxjs": "6.5.5",
             "source-map": "0.7.3"
           }
-<<<<<<< HEAD
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
     "@angular-devkit/build-webpack": {
-<<<<<<< HEAD
-      "version": "0.1000.6",
-      "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1000.6.tgz",
-      "integrity": "sha512-R01bJWuvckU5IdjcqoCeikLBpHRqt5fgfD0a4Hsg3evqW6xxXcSgc+YhWfeEmyU/nF/kVel8G2bFyPzhZP4QdQ==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/architect": "0.1000.6",
-        "@angular-devkit/core": "10.0.6",
-=======
       "version": "0.1000.8",
       "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1000.8.tgz",
       "integrity": "sha512-y/U+dV5N8W7KECncGSKQWoUH/DFNZCseczyl6LAd8bc0fMr8Z0TAIe8OXj+5CSRRdejWfRIxGtNWM+L2kTCU8A==",
@@ -70,20 +37,13 @@
       "requires": {
         "@angular-devkit/architect": "0.1000.8",
         "@angular-devkit/core": "10.0.8",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "rxjs": "6.5.5"
       },
       "dependencies": {
         "@angular-devkit/core": {
-<<<<<<< HEAD
-          "version": "10.0.6",
-          "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.6.tgz",
-          "integrity": "sha512-mVvqSEoeErZ7bAModk95EAa6R9Nl23rvX+/TXuKVTK2dziMFBOrwHjb1DYhnZxFIH4xfUftCx+BWHjXBXCPYlA==",
-=======
           "version": "10.0.8",
           "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz",
           "integrity": "sha512-d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
           "dev": true,
           "requires": {
             "ajv": "6.12.3",
@@ -92,15 +52,6 @@
             "rxjs": "6.5.5",
             "source-map": "0.7.3"
           }
-<<<<<<< HEAD
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -114,27 +65,6 @@
         "magic-string": "0.25.7",
         "rxjs": "6.5.5",
         "source-map": "0.7.3"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "@angular-devkit/schematics": {
@@ -169,21 +99,6 @@
       }
     },
     "@babel/core": {
-<<<<<<< HEAD
-      "version": "7.11.1",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz",
-      "integrity": "sha512-XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.11.0",
-        "@babel/helper-module-transforms": "^7.11.0",
-        "@babel/helpers": "^7.10.4",
-        "@babel/parser": "^7.11.1",
-        "@babel/template": "^7.10.4",
-        "@babel/traverse": "^7.11.0",
-        "@babel/types": "^7.11.0",
-=======
       "version": "7.11.6",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz",
       "integrity": "sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==",
@@ -197,7 +112,6 @@
         "@babel/template": "^7.10.4",
         "@babel/traverse": "^7.11.5",
         "@babel/types": "^7.11.5",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.1",
@@ -208,15 +122,6 @@
         "source-map": "^0.5.0"
       },
       "dependencies": {
-<<<<<<< HEAD
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        },
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -226,21 +131,12 @@
       }
     },
     "@babel/generator": {
-<<<<<<< HEAD
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
-      "integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.11.0",
-=======
       "version": "7.11.6",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
       "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.11.5",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "jsesc": "^2.5.1",
         "source-map": "^0.5.0"
       },
@@ -325,27 +221,6 @@
         "@babel/helper-function-name": "^7.10.4",
         "@babel/types": "^7.10.5",
         "lodash": "^4.17.19"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz",
-      "integrity": "sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@babel/traverse": "^7.10.4",
-=======
       }
     },
     "@babel/helper-explode-assignable-expression": {
@@ -355,7 +230,6 @@
       "dev": true,
       "optional": true,
       "requires": {
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "@babel/types": "^7.10.4"
       }
     },
@@ -420,17 +294,6 @@
         "@babel/template": "^7.10.4",
         "@babel/types": "^7.11.0",
         "lodash": "^4.17.19"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -456,40 +319,18 @@
       "optional": true,
       "requires": {
         "lodash": "^4.17.19"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "@babel/helper-remap-async-to-generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz",
-      "integrity": "sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==",
-=======
       }
     },
     "@babel/helper-remap-async-to-generator": {
       "version": "7.11.4",
       "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
       "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "optional": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.10.4",
         "@babel/helper-wrap-function": "^7.10.4",
         "@babel/template": "^7.10.4",
-<<<<<<< HEAD
-        "@babel/traverse": "^7.10.4",
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "@babel/types": "^7.10.4"
       }
     },
@@ -609,8 +450,6 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
           "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
           "dev": true
-<<<<<<< HEAD
-=======
         },
         "has-flag": {
           "version": "3.0.0",
@@ -626,20 +465,13 @@
           "requires": {
             "has-flag": "^3.0.0"
           }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
     "@babel/parser": {
-<<<<<<< HEAD
-      "version": "7.11.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
-      "integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==",
-=======
       "version": "7.11.5",
       "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
       "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
@@ -1265,15 +1097,9 @@
       }
     },
     "@babel/preset-env": {
-<<<<<<< HEAD
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz",
-      "integrity": "sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==",
-=======
       "version": "7.11.5",
       "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz",
       "integrity": "sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "optional": true,
       "requires": {
@@ -1339,11 +1165,7 @@
         "@babel/plugin-transform-unicode-escapes": "^7.10.4",
         "@babel/plugin-transform-unicode-regex": "^7.10.4",
         "@babel/preset-modules": "^0.1.3",
-<<<<<<< HEAD
-        "@babel/types": "^7.11.0",
-=======
         "@babel/types": "^7.11.5",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "browserslist": "^4.12.0",
         "core-js-compat": "^3.6.2",
         "invariant": "^2.2.2",
@@ -1352,15 +1174,9 @@
       }
     },
     "@babel/preset-modules": {
-<<<<<<< HEAD
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
-      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
-=======
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
       "integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "optional": true,
       "requires": {
@@ -1393,36 +1209,6 @@
       }
     },
     "@babel/traverse": {
-<<<<<<< HEAD
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-      "integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.10.4",
-        "@babel/generator": "^7.11.0",
-        "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-split-export-declaration": "^7.11.0",
-        "@babel/parser": "^7.11.0",
-        "@babel/types": "^7.11.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0",
-        "lodash": "^4.17.19"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
-      }
-    },
-    "@babel/types": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-      "integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
-=======
       "version": "7.11.5",
       "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
       "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
@@ -1443,23 +1229,11 @@
       "version": "7.11.5",
       "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
       "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "requires": {
         "@babel/helper-validator-identifier": "^7.10.4",
         "lodash": "^4.17.19",
         "to-fast-properties": "^2.0.0"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "@bcoe/v8-coverage": {
@@ -1563,17 +1337,6 @@
         "jest-message-util": "^25.5.0",
         "jest-util": "^25.5.0",
         "slash": "^3.0.0"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "@jest/core": {
@@ -1631,24 +1394,6 @@
             "picomatch": "^2.0.5"
           }
         },
-<<<<<<< HEAD
-        "rimraf": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-          "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "type-fest": {
           "version": "0.11.0",
           "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
@@ -1725,17 +1470,10 @@
         "v8-to-istanbul": "^4.1.3"
       },
       "dependencies": {
-<<<<<<< HEAD
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-=======
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
           "dev": true
         }
       }
@@ -1749,8 +1487,6 @@
         "callsites": "^3.0.0",
         "graceful-fs": "^4.2.4",
         "source-map": "^0.6.0"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "source-map": {
@@ -1759,7 +1495,6 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "@jest/test-result": {
@@ -1821,17 +1556,10 @@
             "picomatch": "^2.0.5"
           }
         },
-<<<<<<< HEAD
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-=======
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
           "dev": true
         }
       }
@@ -1848,8 +1576,6 @@
         "chalk": "^3.0.0"
       }
     },
-<<<<<<< HEAD
-=======
     "@nodelib/fs.scandir": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
@@ -1893,7 +1619,6 @@
         }
       }
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "@nrwl/angular": {
       "version": "10.0.7",
       "resolved": "https://registry.npmjs.org/@nrwl/angular/-/angular-10.0.7.tgz",
@@ -1929,15 +1654,12 @@
             "color-convert": "^1.9.0"
           }
         },
-<<<<<<< HEAD
-=======
         "camelcase": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
           "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
           "dev": true
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "chalk": {
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -1963,8 +1685,6 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
           "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
           "dev": true
-<<<<<<< HEAD
-=======
         },
         "find-up": {
           "version": "2.1.0",
@@ -2069,7 +1789,6 @@
           "requires": {
             "camelcase": "^4.1.0"
           }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -2110,20 +1829,6 @@
       }
     },
     "@nrwl/linter": {
-<<<<<<< HEAD
-      "version": "10.0.13",
-      "resolved": "https://registry.npmjs.org/@nrwl/linter/-/linter-10.0.13.tgz",
-      "integrity": "sha512-UaTn6/y+I19fPb0GNNBHFtFtsieGkWIdG2t8hL0oT5mo7qYPIUD4QkxluHITVDVH0Y0SqvNvBvgLCyJKKUEjHQ==",
-      "dev": true,
-      "requires": {
-        "@angular-devkit/architect": "~0.1000.0"
-      }
-    },
-    "@nrwl/node": {
-      "version": "10.0.13",
-      "resolved": "https://registry.npmjs.org/@nrwl/node/-/node-10.0.13.tgz",
-      "integrity": "sha512-05OQH4tSpEU5jc4G1EYnXdKLyqURNIAKBE0+uBNLsNUPUPzWCCH/DaxlktaBCtp6VbxYAysGdU0t7/9XQwVGTA==",
-=======
       "version": "10.2.1",
       "resolved": "https://registry.npmjs.org/@nrwl/linter/-/linter-10.2.1.tgz",
       "integrity": "sha512-Ax7RMTpztXl4+eZodxqMPlk00uGjrq2gicVWsW4lKOLfRfJl5F+WbAYNgPRVd02S00pU8t2/Nrhb7n8ORPwylw==",
@@ -2155,24 +1860,16 @@
       "version": "10.2.1",
       "resolved": "https://registry.npmjs.org/@nrwl/node/-/node-10.2.1.tgz",
       "integrity": "sha512-5ruJItysPvTltsw/CgtBnx5+6SuEdNT85UqTLxSMpQ8TVNMbr4upWjXY/ZYVfc4CxsPD40yIKn+sI4ZYQwvblA==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "requires": {
         "@angular-devkit/architect": "~0.1000.0",
         "@angular-devkit/build-webpack": "~0.1000.0",
         "@angular-devkit/core": "~10.0.0",
         "@angular-devkit/schematics": "~10.0.0",
-<<<<<<< HEAD
-        "@nrwl/jest": "10.0.13",
-        "@nrwl/linter": "10.0.13",
-        "circular-dependency-plugin": "5.2.0",
-        "copy-webpack-plugin": "5.1.1",
-=======
         "@nrwl/jest": "10.2.1",
         "@nrwl/linter": "10.2.1",
         "circular-dependency-plugin": "5.2.0",
         "copy-webpack-plugin": "6.0.3",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "fork-ts-checker-webpack-plugin": "^3.1.1",
         "license-webpack-plugin": "2.1.2",
         "source-map-support": "0.5.12",
@@ -2186,70 +1883,34 @@
       },
       "dependencies": {
         "@nrwl/jest": {
-<<<<<<< HEAD
-          "version": "10.0.13",
-          "resolved": "https://registry.npmjs.org/@nrwl/jest/-/jest-10.0.13.tgz",
-          "integrity": "sha512-SOwZm/JComapmfH/xXZZyediTfQTJV6ViHUU7zm+JSOfZioBcpzlBo3BGEefhXb7tq4pBx0tCgZTo8BWWZbcLw==",
-=======
           "version": "10.2.1",
           "resolved": "https://registry.npmjs.org/@nrwl/jest/-/jest-10.2.1.tgz",
           "integrity": "sha512-JD7mjCAm2g+p7ALiC9aVzL8YNDFHUQUbZHp1H3mbntqi/VXMHfWY5/yL2yiFE3ocZpHMxYpJ5dFDL0ZsF8QtzA==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
           "dev": true,
           "requires": {
             "@angular-devkit/architect": "~0.1000.0",
             "@angular-devkit/core": "~10.0.0",
-<<<<<<< HEAD
-            "@angular-devkit/schematics": "~10.0.0"
-          }
-        },
-        "source-map-support": {
-          "version": "0.5.12",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
-          "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
-          "dev": true,
-          "requires": {
-            "buffer-from": "^1.0.0",
-            "source-map": "^0.6.0"
-=======
             "@angular-devkit/schematics": "~10.0.0",
             "rxjs": "^6.5.4"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
           }
         }
       }
     },
     "@nrwl/nx-plugin": {
-<<<<<<< HEAD
-      "version": "10.0.13",
-      "resolved": "https://registry.npmjs.org/@nrwl/nx-plugin/-/nx-plugin-10.0.13.tgz",
-      "integrity": "sha512-NhBnZJdVU/hm+xuEz3HHhPBmPTxc8ybeC9CV3bVE1VGZa610ppSf5v0VRAgyp3+ZC4BTARi96FBss8EnBJkKzQ==",
-=======
       "version": "10.2.1",
       "resolved": "https://registry.npmjs.org/@nrwl/nx-plugin/-/nx-plugin-10.2.1.tgz",
       "integrity": "sha512-zwdC4Kx5v/42fabEeLWTE+MvwhjTZBJaxo3tHNLTPrP/brF+fchYxIVZ3DbbLfvKs4nyVc+DJyt2NtiJjyGsqQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "requires": {
         "@angular-devkit/architect": "~0.1000.0",
         "@angular-devkit/core": "~10.0.0",
         "@angular-devkit/schematics": "~10.0.0",
-<<<<<<< HEAD
-        "@nrwl/linter": "10.0.13",
-        "@nrwl/node": "10.0.13",
-        "fs-extra": "7.0.1",
-        "inquirer": "^6.3.1",
-        "tmp": "0.0.33",
-        "yargs": "^11.0.0",
-        "yargs-parser": "10.0.0"
-=======
         "@nrwl/linter": "10.2.1",
         "@nrwl/node": "10.2.1",
         "fs-extra": "7.0.1",
         "inquirer": "^6.3.1",
         "tmp": "0.0.33",
         "yargs": "15.4.1"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "@nrwl/tao": {
@@ -2300,15 +1961,12 @@
             "color-convert": "^1.9.0"
           }
         },
-<<<<<<< HEAD
-=======
         "camelcase": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
           "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
           "dev": true
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "chalk": {
           "version": "2.4.2",
           "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -2341,8 +1999,6 @@
           "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw==",
           "dev": true
         },
-<<<<<<< HEAD
-=======
         "find-up": {
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
@@ -2352,7 +2008,6 @@
             "locate-path": "^2.0.0"
           }
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "fs-extra": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.0.tgz",
@@ -2364,32 +2019,18 @@
             "universalify": "^0.1.0"
           }
         },
-<<<<<<< HEAD
-=======
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
           "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "ignore": {
           "version": "5.0.4",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.0.4.tgz",
           "integrity": "sha512-WLsTMEhsQuXpCiG173+f3aymI43SXa+fB1rSfbzyP4GkPP+ZFVuO0/3sFUGNBtifisPeDcl/uD/Y2NxZ7xFq4g==",
           "dev": true
         },
-<<<<<<< HEAD
-        "semver": {
-          "version": "5.4.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-          "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
-          "dev": true
-        }
-      }
-    },
-    "@schematics/angular": {
-=======
         "locate-path": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
@@ -2488,7 +2129,6 @@
       }
     },
     "@schematics/angular": {
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "version": "10.0.5",
       "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.5.tgz",
       "integrity": "sha512-zg8QxgW3uLva/MSKMRYfV7dzj00SUki4nxYN4j1rw42VlwNPnFrPtzFVEilL6N7wFgoHP/6cZRgm4bfXYvLBvg==",
@@ -2507,15 +2147,9 @@
       }
     },
     "@types/babel__core": {
-<<<<<<< HEAD
-      "version": "7.1.9",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz",
-      "integrity": "sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw==",
-=======
       "version": "7.1.10",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz",
       "integrity": "sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -2526,30 +2160,18 @@
       }
     },
     "@types/babel__generator": {
-<<<<<<< HEAD
-      "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz",
-      "integrity": "sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==",
-=======
       "version": "7.6.2",
       "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
       "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0"
       }
     },
     "@types/babel__template": {
-<<<<<<< HEAD
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
-      "integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
-=======
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.3.tgz",
       "integrity": "sha512-uCoznIPDmnickEi6D0v11SBpW0OuVqHJCa7syXqQHy5uktSCreIlt0iglsCnmvz8yCb38hGcWeseA8cWJSwv5Q==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -2557,15 +2179,9 @@
       }
     },
     "@types/babel__traverse": {
-<<<<<<< HEAD
-      "version": "7.0.13",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.13.tgz",
-      "integrity": "sha512-i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ==",
-=======
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz",
       "integrity": "sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "requires": {
         "@babel/types": "^7.3.0"
@@ -2601,14 +2217,11 @@
         "@types/node": "*"
       }
     },
-<<<<<<< HEAD
-=======
     "@types/is-glob": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/@types/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-k3RS5HyBPu4h+5hTmIEfPB2rl5P3LnGdQEZrV2b9OWTJVtsUQ2VBcedqYKGqxvZqle5UALUXdSfVA8nf3HfyWQ=="
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "@types/istanbul-lib-coverage": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz",
@@ -2645,15 +2258,9 @@
       }
     },
     "@types/json-schema": {
-<<<<<<< HEAD
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz",
-      "integrity": "sha512-8+KAKzEvSUdeo+kmqnKrqgeE+LcA0tjYWFY7RPProVYwnqDjukzO+3b6dLD56rYX5TdWejnEOLJYOIeh4CXKuA=="
-=======
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz",
       "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw=="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "@types/json5": {
       "version": "0.0.29",
@@ -2667,12 +2274,6 @@
       "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
       "dev": true
     },
-<<<<<<< HEAD
-    "@types/node": {
-      "version": "8.9.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz",
-      "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ=="
-=======
     "@types/mkdirp": {
       "version": "0.5.2",
       "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz",
@@ -2693,7 +2294,6 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz",
       "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==",
       "dev": true
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "@types/normalize-package-data": {
       "version": "2.4.0",
@@ -2702,15 +2302,9 @@
       "dev": true
     },
     "@types/prettier": {
-<<<<<<< HEAD
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.0.tgz",
-      "integrity": "sha512-gDE8JJEygpay7IjA/u3JiIURvwZW08f0cZSZLAzFoX/ZmeqvS0Sqv+97aKuHpNsalAMMhwPe+iAS6fQbfmbt7A=="
-=======
       "version": "1.19.1",
       "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.1.tgz",
       "integrity": "sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ=="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "@types/source-list-map": {
       "version": "0.1.2",
@@ -2733,14 +2327,6 @@
         "@types/node": "*",
         "@types/source-list-map": "*",
         "source-map": "^0.6.1"
-<<<<<<< HEAD
-      }
-    },
-    "@types/yargs": {
-      "version": "15.0.5",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.5.tgz",
-      "integrity": "sha512-Dk/IDOPtOgubt/IaevIUbTgV7doaKkoorvOyYM2CMwuDyP89bekI7H4xLIwunNYiK9jhCkmc6pUrJk3cj2AB9w==",
-=======
       },
       "dependencies": {
         "source-map": {
@@ -2755,7 +2341,6 @@
       "version": "15.0.7",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.7.tgz",
       "integrity": "sha512-Gf4u3EjaPNcC9cTu4/j2oN14nSVhr8PQ+BvBcBQHAhDZfl0bVIiLgvnRXv/dn58XhTm9UXvBpvJpDlwV65QxOA==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "requires": {
         "@types/yargs-parser": "*"
@@ -2780,12 +2365,6 @@
         "tsutils": "^3.17.1"
       },
       "dependencies": {
-<<<<<<< HEAD
-        "regexpp": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.0.0.tgz",
-          "integrity": "sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==",
-=======
         "@typescript-eslint/experimental-utils": {
           "version": "2.19.2",
           "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.19.2.tgz",
@@ -2825,34 +2404,11 @@
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
           "dev": true
         }
       }
     },
     "@typescript-eslint/experimental-utils": {
-<<<<<<< HEAD
-      "version": "2.19.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.19.2.tgz",
-      "integrity": "sha512-B88QuwT1wMJR750YvTJBNjMZwmiPpbmKYLm1yI7PCc3x0NariqPwqaPsoJRwU9DmUi0cd9dkhz1IqEnwfD+P1A==",
-      "dev": true,
-      "requires": {
-        "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/typescript-estree": "2.19.2",
-        "eslint-scope": "^5.0.0"
-      },
-      "dependencies": {
-        "eslint-scope": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz",
-          "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
-          }
-        }
-=======
       "version": "2.34.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz",
       "integrity": "sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==",
@@ -2862,7 +2418,6 @@
         "@typescript-eslint/typescript-estree": "2.34.0",
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "@typescript-eslint/parser": {
@@ -2875,14 +2430,6 @@
         "@typescript-eslint/experimental-utils": "2.19.2",
         "@typescript-eslint/typescript-estree": "2.19.2",
         "eslint-visitor-keys": "^1.1.0"
-<<<<<<< HEAD
-      }
-    },
-    "@typescript-eslint/typescript-estree": {
-      "version": "2.19.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.19.2.tgz",
-      "integrity": "sha512-Xu/qa0MDk6upQWqE4Qy2X16Xg8Vi32tQS2PR0AvnT/ZYS4YGDvtn2MStOh5y8Zy2mg4NuL06KUHlvCh95j9C6Q==",
-=======
       },
       "dependencies": {
         "@typescript-eslint/experimental-utils": {
@@ -2923,7 +2470,6 @@
       "version": "2.34.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz",
       "integrity": "sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "requires": {
         "debug": "^4.1.1",
@@ -2931,31 +2477,6 @@
         "glob": "^7.1.6",
         "is-glob": "^4.0.1",
         "lodash": "^4.17.15",
-<<<<<<< HEAD
-        "semver": "^6.3.0",
-        "tsutils": "^3.17.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "ms": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-          "dev": true
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-=======
         "semver": "^7.3.2",
         "tsutils": "^3.17.1"
       },
@@ -2964,7 +2485,6 @@
           "version": "7.3.2",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
           "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
           "dev": true
         }
       }
@@ -3158,15 +2678,9 @@
       "dev": true
     },
     "abab": {
-<<<<<<< HEAD
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz",
-      "integrity": "sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ==",
-=======
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
       "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true
     },
     "accepts": {
@@ -3196,15 +2710,9 @@
       }
     },
     "acorn-jsx": {
-<<<<<<< HEAD
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
-      "integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
-=======
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
       "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true
     },
     "acorn-walk": {
@@ -3213,8 +2721,6 @@
       "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==",
       "dev": true
     },
-<<<<<<< HEAD
-=======
     "aggregate-error": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
@@ -3225,15 +2731,10 @@
         "indent-string": "^4.0.0"
       }
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "ajv": {
       "version": "6.12.3",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
       "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "requires": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -3272,15 +2773,9 @@
       "dev": true
     },
     "ansi-regex": {
-<<<<<<< HEAD
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
-=======
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
       "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "ansi-styles": {
       "version": "4.2.1",
@@ -3351,20 +2846,10 @@
       "dev": true
     },
     "array-union": {
-<<<<<<< HEAD
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
-      "dev": true,
-      "requires": {
-        "array-uniq": "^1.0.1"
-      }
-=======
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "array-uniq": {
       "version": "1.0.3",
@@ -3549,15 +3034,12 @@
         "js-tokens": "^3.0.2"
       },
       "dependencies": {
-<<<<<<< HEAD
-=======
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "ansi-styles": {
           "version": "2.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
@@ -3614,17 +3096,6 @@
         "chalk": "^3.0.0",
         "graceful-fs": "^4.2.4",
         "slash": "^3.0.0"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "babel-loader": {
@@ -3639,28 +3110,6 @@
         "mkdirp": "^0.5.3",
         "pify": "^4.0.1",
         "schema-utils": "^2.6.5"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true,
-          "optional": true
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "babel-plugin-dynamic-import-node": {
@@ -3729,12 +3178,7 @@
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-<<<<<<< HEAD
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-=======
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "base": {
       "version": "0.11.2",
@@ -3824,8 +3268,6 @@
       "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
       "dev": true
     },
-<<<<<<< HEAD
-=======
     "bindings": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
@@ -3836,7 +3278,6 @@
         "file-uri-to-path": "1.0.0"
       }
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "bluebird": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz",
@@ -3908,10 +3349,6 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "requires": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -4056,18 +3493,6 @@
       }
     },
     "browserslist": {
-<<<<<<< HEAD
-      "version": "4.14.0",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz",
-      "integrity": "sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "caniuse-lite": "^1.0.30001111",
-        "electron-to-chromium": "^1.3.523",
-        "escalade": "^3.0.2",
-        "node-releases": "^1.1.60"
-=======
       "version": "4.14.5",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz",
       "integrity": "sha512-Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA==",
@@ -4078,7 +3503,6 @@
         "electron-to-chromium": "^1.3.571",
         "escalade": "^3.1.0",
         "node-releases": "^1.1.61"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "bs-logger": {
@@ -4147,28 +3571,6 @@
       "dev": true
     },
     "cacache": {
-<<<<<<< HEAD
-      "version": "12.0.4",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
-      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.5.5",
-        "chownr": "^1.1.1",
-        "figgy-pudding": "^3.5.1",
-        "glob": "^7.1.4",
-        "graceful-fs": "^4.1.15",
-        "infer-owner": "^1.0.3",
-        "lru-cache": "^5.1.1",
-        "mississippi": "^3.0.0",
-        "mkdirp": "^0.5.1",
-        "move-concurrently": "^1.0.1",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^2.6.3",
-        "ssri": "^6.0.1",
-        "unique-filename": "^1.1.1",
-        "y18n": "^4.0.0"
-=======
       "version": "15.0.5",
       "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.5.tgz",
       "integrity": "sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A==",
@@ -4199,7 +3601,6 @@
           "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
           "dev": true
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "cache-base": {
@@ -4237,15 +3638,9 @@
       "dev": true
     },
     "caniuse-lite": {
-<<<<<<< HEAD
-      "version": "1.0.30001116",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001116.tgz",
-      "integrity": "sha512-f2lcYnmAI5Mst9+g0nkMIznFGsArRmZ0qU+dnq8l91hymdc2J3SFbiPhOJEeDqC1vtE8nc1qNQyklzB8veJefQ==",
-=======
       "version": "1.0.30001142",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001142.tgz",
       "integrity": "sha512-pDPpn9ankEpBFZXyCv2I4lh1v/ju+bqb78QfKf+w9XgDAFWBwSYPswXqprRdrgQWK0wQnpIbfwRjNHO1HWqvoQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "optional": true
     },
@@ -4271,19 +3666,6 @@
       "requires": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "chardet": {
@@ -4309,15 +3691,9 @@
       }
     },
     "chownr": {
-<<<<<<< HEAD
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
-=======
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true
     },
     "chrome-trace-event": {
@@ -4374,15 +3750,12 @@
         }
       }
     },
-<<<<<<< HEAD
-=======
     "clean-stack": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
       "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
       "dev": true
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "cli-color": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-1.4.0.tgz",
@@ -4394,8 +3767,6 @@
         "es6-iterator": "^2.0.3",
         "memoizee": "^0.4.14",
         "timers-ext": "^0.1.5"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "ansi-regex": {
@@ -4403,7 +3774,6 @@
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "cli-cursor": {
@@ -4570,12 +3940,7 @@
     "concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-<<<<<<< HEAD
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-=======
       "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "concat-stream": {
       "version": "1.6.2",
@@ -4655,8 +4020,6 @@
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.0"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "rimraf": {
@@ -4668,7 +4031,6 @@
             "glob": "^7.1.3"
           }
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "copy-descriptor": {
@@ -4678,44 +4040,6 @@
       "dev": true
     },
     "copy-webpack-plugin": {
-<<<<<<< HEAD
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz",
-      "integrity": "sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==",
-      "dev": true,
-      "requires": {
-        "cacache": "^12.0.3",
-        "find-cache-dir": "^2.1.0",
-        "glob-parent": "^3.1.0",
-        "globby": "^7.1.1",
-        "is-glob": "^4.0.1",
-        "loader-utils": "^1.2.3",
-        "minimatch": "^3.0.4",
-        "normalize-path": "^3.0.0",
-        "p-limit": "^2.2.1",
-        "schema-utils": "^1.0.0",
-        "serialize-javascript": "^2.1.2",
-        "webpack-log": "^2.0.0"
-      },
-      "dependencies": {
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-=======
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.3.tgz",
       "integrity": "sha512-q5m6Vz4elsuyVEIUXr7wJdIdePWTubsqVbEMvf1WQnHGv0Q+9yPRu7MtYFPt+GBOXRav9lvIINifTQ1vSCs+eA==",
@@ -4809,23 +4133,10 @@
               "dev": true,
               "requires": {
                 "p-try": "^2.0.0"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
               }
             }
           }
         },
-<<<<<<< HEAD
-        "schema-utils": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
-          "dev": true,
-          "requires": {
-            "ajv": "^6.1.0",
-            "ajv-errors": "^1.0.0",
-            "ajv-keywords": "^3.1.0"
-          }
-=======
         "path-exists": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -4846,7 +4157,6 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -5153,8 +4463,6 @@
         "rimraf": "^2.6.3"
       },
       "dependencies": {
-<<<<<<< HEAD
-=======
         "array-union": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
@@ -5164,7 +4472,6 @@
             "array-uniq": "^1.0.1"
           }
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "globby": {
           "version": "6.1.0",
           "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
@@ -5185,8 +4492,6 @@
               "dev": true
             }
           }
-<<<<<<< HEAD
-=======
         },
         "p-map": {
           "version": "2.1.0",
@@ -5202,7 +4507,6 @@
           "requires": {
             "glob": "^7.1.3"
           }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -5278,21 +4582,12 @@
       }
     },
     "dir-glob": {
-<<<<<<< HEAD
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz",
-      "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
-      "dev": true,
-      "requires": {
-        "path-type": "^3.0.0"
-=======
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
       "requires": {
         "path-type": "^4.0.0"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "dns-equal": {
@@ -5379,15 +4674,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-<<<<<<< HEAD
-      "version": "1.3.539",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.539.tgz",
-      "integrity": "sha512-rM0LWDIstdqfaRUADZetNrL6+zd/0NBmavbMEhBXgc2u/CC1d1GaDyN5hho29fFvBiOVFwrSWZkzmNcZnCEDog==",
-=======
       "version": "1.3.576",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.576.tgz",
       "integrity": "sha512-uSEI0XZ//5ic+0NdOqlxp0liCD44ck20OAGyLMSymIWTEAtHKVJi6JM18acOnRgUgX7Q65QqnI+sNncNvIy8ew==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "optional": true
     },
@@ -5471,35 +4760,21 @@
       }
     },
     "es-abstract": {
-<<<<<<< HEAD
-      "version": "1.17.6",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
-      "integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
-=======
       "version": "1.18.0-next.1",
       "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz",
       "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "requires": {
         "es-to-primitive": "^1.2.1",
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
         "has-symbols": "^1.0.1",
-<<<<<<< HEAD
-        "is-callable": "^1.2.0",
-        "is-regex": "^1.1.0",
-        "object-inspect": "^1.7.0",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.0",
-=======
         "is-callable": "^1.2.2",
         "is-negative-zero": "^2.0.0",
         "is-regex": "^1.1.1",
         "object-inspect": "^1.8.0",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.1",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "string.prototype.trimend": "^1.0.1",
         "string.prototype.trimstart": "^1.0.1"
       }
@@ -5556,15 +4831,9 @@
       }
     },
     "escalade": {
-<<<<<<< HEAD
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz",
-      "integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==",
-=======
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.0.tgz",
       "integrity": "sha512-mAk+hPSO8fLDkhV7V0dXazH5pDc6MrjBTPyD3VeKzxnVFjH1MIxbCdqGZB9O8+EwWakZs3ZCbDS4IpRt79V1ig==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "optional": true
     },
@@ -5590,8 +4859,6 @@
         "esutils": "^2.0.2",
         "optionator": "^0.8.1",
         "source-map": "~0.6.1"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "source-map": {
@@ -5601,7 +4868,6 @@
           "dev": true,
           "optional": true
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "eslint": {
@@ -5666,15 +4932,6 @@
             }
           }
         },
-<<<<<<< HEAD
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        },
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "ansi-styles": {
           "version": "3.2.1",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -5716,16 +4973,6 @@
           "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
           "dev": true
         },
-<<<<<<< HEAD
-        "eslint-scope": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
-          "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
-          "dev": true,
-          "requires": {
-            "esrecurse": "^4.1.0",
-            "estraverse": "^4.1.1"
-=======
         "eslint-utils": {
           "version": "1.4.3",
           "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
@@ -5733,7 +4980,6 @@
           "dev": true,
           "requires": {
             "eslint-visitor-keys": "^1.1.0"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
           }
         },
         "figures": {
@@ -5754,15 +5000,12 @@
             "type-fest": "^0.8.1"
           }
         },
-<<<<<<< HEAD
-=======
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
           "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "ignore": {
           "version": "4.0.6",
           "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
@@ -5825,17 +5068,10 @@
               "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
               "dev": true
             },
-<<<<<<< HEAD
-            "lodash": {
-              "version": "4.17.20",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-              "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-=======
             "has-flag": {
               "version": "4.0.0",
               "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
               "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
               "dev": true
             },
             "strip-ansi": {
@@ -5848,15 +5084,9 @@
               }
             },
             "supports-color": {
-<<<<<<< HEAD
-              "version": "7.1.0",
-              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-              "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-=======
               "version": "7.2.0",
               "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
               "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
               "dev": true,
               "requires": {
                 "has-flag": "^4.0.0"
@@ -5870,18 +5100,6 @@
           "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
           "dev": true
         },
-<<<<<<< HEAD
-        "mute-stream": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-          "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-          "dev": true
-        },
-        "rxjs": {
-          "version": "6.6.2",
-          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz",
-          "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==",
-=======
         "regexpp": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
@@ -5892,7 +5110,6 @@
           "version": "6.6.3",
           "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.3.tgz",
           "integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
           "dev": true,
           "requires": {
             "tslib": "^1.9.0"
@@ -5948,8 +5165,6 @@
           "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
           "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
           "dev": true
-<<<<<<< HEAD
-=======
         },
         "supports-color": {
           "version": "5.5.0",
@@ -5959,7 +5174,6 @@
           "requires": {
             "has-flag": "^3.0.0"
           }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -5973,49 +5187,28 @@
       }
     },
     "eslint-scope": {
-<<<<<<< HEAD
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.1.0",
-=======
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
       "requires": {
         "esrecurse": "^4.3.0",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "estraverse": "^4.1.1"
       }
     },
     "eslint-utils": {
-<<<<<<< HEAD
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
-=======
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz",
       "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
       }
     },
     "eslint-visitor-keys": {
-<<<<<<< HEAD
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
-      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
-=======
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
       "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true
     },
     "espree": {
@@ -6060,14 +5253,6 @@
       }
     },
     "esrecurse": {
-<<<<<<< HEAD
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.1.0"
-=======
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
@@ -6082,7 +5267,6 @@
           "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
           "dev": true
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "estraverse": {
@@ -6113,15 +5297,9 @@
       }
     },
     "eventemitter3": {
-<<<<<<< HEAD
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
-      "integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
-=======
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true
     },
     "events": {
@@ -6310,15 +5488,9 @@
       },
       "dependencies": {
         "type": {
-<<<<<<< HEAD
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow=="
-=======
           "version": "2.1.0",
           "resolved": "https://registry.npmjs.org/type/-/type-2.1.0.tgz",
           "integrity": "sha512-G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA=="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -6432,11 +5604,6 @@
       "dev": true
     },
     "fast-deep-equal": {
-<<<<<<< HEAD
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz",
-      "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
-=======
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
@@ -6466,7 +5633,6 @@
           }
         }
       }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "fast-json-stable-stringify": {
       "version": "2.1.0",
@@ -6479,8 +5645,6 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
-<<<<<<< HEAD
-=======
     "fastq": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
@@ -6490,7 +5654,6 @@
         "reusify": "^1.0.4"
       }
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "faye-websocket": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
@@ -6533,8 +5696,6 @@
         "flat-cache": "^2.0.1"
       }
     },
-<<<<<<< HEAD
-=======
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
@@ -6542,7 +5703,6 @@
       "dev": true,
       "optional": true
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -6710,8 +5870,6 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
           "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
           "dev": true
-<<<<<<< HEAD
-=======
         },
         "has-flag": {
           "version": "3.0.0",
@@ -6727,7 +5885,6 @@
           "requires": {
             "has-flag": "^3.0.0"
           }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -6789,8 +5946,6 @@
         "universalify": "^0.1.0"
       }
     },
-<<<<<<< HEAD
-=======
     "fs-minipass": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
@@ -6800,7 +5955,6 @@
         "minipass": "^3.0.0"
       }
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "fs-write-stream-atomic": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
@@ -6816,12 +5970,7 @@
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-<<<<<<< HEAD
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-=======
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "fsevents": {
       "version": "2.1.3",
@@ -6894,10 +6043,6 @@
       "version": "7.1.6",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
       "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -6923,27 +6068,6 @@
       "dev": true
     },
     "globby": {
-<<<<<<< HEAD
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz",
-      "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
-      "dev": true,
-      "requires": {
-        "array-union": "^1.0.1",
-        "dir-glob": "^2.0.0",
-        "glob": "^7.1.2",
-        "ignore": "^3.3.5",
-        "pify": "^3.0.0",
-        "slash": "^1.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        }
-=======
       "version": "11.0.1",
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz",
       "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==",
@@ -6955,7 +6079,6 @@
         "ignore": "^5.1.4",
         "merge2": "^1.3.0",
         "slash": "^3.0.0"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "graceful-fs": {
@@ -7009,8 +6132,6 @@
       "dev": true,
       "requires": {
         "ansi-regex": "^2.0.0"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "ansi-regex": {
@@ -7019,7 +6140,6 @@
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "has-flag": {
@@ -7276,15 +6396,9 @@
       "dev": true
     },
     "ignore": {
-<<<<<<< HEAD
-      "version": "3.3.10",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-      "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-=======
       "version": "5.1.8",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
       "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true
     },
     "import-fresh": {
@@ -7321,15 +6435,12 @@
       "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
       "dev": true
     },
-<<<<<<< HEAD
-=======
     "indent-string": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
       "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "dev": true
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "infer-owner": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
@@ -7340,10 +6451,6 @@
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
       "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "requires": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -7352,12 +6459,7 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-<<<<<<< HEAD
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-=======
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "inquirer": {
       "version": "6.5.2",
@@ -7430,30 +6532,24 @@
           "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
           "dev": true
         },
-<<<<<<< HEAD
-=======
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
           "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
           "dev": true
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "mimic-fn": {
           "version": "1.2.0",
           "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
           "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
           "dev": true
         },
-<<<<<<< HEAD
-=======
         "mute-stream": {
           "version": "0.0.7",
           "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
           "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
           "dev": true
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "onetime": {
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
@@ -7481,8 +6577,6 @@
           "requires": {
             "ansi-regex": "^4.1.0"
           }
-<<<<<<< HEAD
-=======
         },
         "supports-color": {
           "version": "5.5.0",
@@ -7492,7 +6586,6 @@
           "requires": {
             "has-flag": "^3.0.0"
           }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -7594,15 +6687,9 @@
       "dev": true
     },
     "is-callable": {
-<<<<<<< HEAD
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
-      "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
-=======
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz",
       "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true
     },
     "is-ci": {
@@ -7681,12 +6768,7 @@
     "is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-<<<<<<< HEAD
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-=======
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "is-fullwidth-code-point": {
       "version": "2.0.0",
@@ -7704,10 +6786,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -7717,15 +6795,12 @@
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
       "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="
     },
-<<<<<<< HEAD
-=======
     "is-negative-zero": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
       "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=",
       "dev": true
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -7766,15 +6841,9 @@
       }
     },
     "is-promise": {
-<<<<<<< HEAD
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
-=======
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
       "integrity": "sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "is-regex": {
       "version": "1.1.1",
@@ -7893,18 +6962,6 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
           "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
           "dev": true
-<<<<<<< HEAD
-        },
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -7917,8 +6974,6 @@
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
         "source-map": "^0.6.1"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "source-map": {
@@ -7927,7 +6982,6 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "istanbul-reports": {
@@ -7960,20 +7014,6 @@
         "jest-cli": "^25.2.4"
       },
       "dependencies": {
-<<<<<<< HEAD
-        "cliui": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^6.2.0"
-          }
-        },
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "find-up": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -7984,15 +7024,6 @@
             "path-exists": "^4.0.0"
           }
         },
-<<<<<<< HEAD
-        "get-caller-file": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-          "dev": true
-        },
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "import-local": {
           "version": "3.0.2",
           "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
@@ -8003,15 +7034,6 @@
             "resolve-cwd": "^3.0.0"
           }
         },
-<<<<<<< HEAD
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "jest-cli": {
           "version": "25.5.4",
           "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.5.4.tgz",
@@ -8067,15 +7089,6 @@
             "find-up": "^4.0.0"
           }
         },
-<<<<<<< HEAD
-        "require-main-filename": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-          "dev": true
-        },
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "resolve-cwd": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
@@ -8090,60 +7103,6 @@
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
           "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
           "dev": true
-<<<<<<< HEAD
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "yargs": {
-          "version": "15.4.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-          "dev": true,
-          "requires": {
-            "cliui": "^6.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^4.1.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^4.2.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^18.1.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "18.1.3",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -8478,15 +7437,6 @@
             "braces": "^3.0.1",
             "picomatch": "^2.0.5"
           }
-<<<<<<< HEAD
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -8526,17 +7476,6 @@
         "realpath-native": "^2.0.0",
         "resolve": "^1.17.0",
         "slash": "^3.0.0"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "jest-resolve-dependencies": {
@@ -8567,177 +7506,34 @@
         "jest-docblock": "^25.3.0",
         "jest-haste-map": "^25.5.1",
         "jest-jasmine2": "^25.5.4",
-        "jest-leak-detector": "^25.5.0",
-        "jest-message-util": "^25.5.0",
-        "jest-resolve": "^25.5.1",
-        "jest-runtime": "^25.5.4",
-        "jest-util": "^25.5.0",
-        "jest-worker": "^25.5.0",
-        "source-map-support": "^0.5.6",
-        "throat": "^5.0.0"
-      }
-    },
-    "jest-runtime": {
-      "version": "25.5.4",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.5.4.tgz",
-      "integrity": "sha512-RWTt8LeWh3GvjYtASH2eezkc8AehVoWKK20udV6n3/gC87wlTbE1kIA+opCvNWyyPeBs6ptYsc6nyHUb1GlUVQ==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^25.5.0",
-        "@jest/environment": "^25.5.0",
-        "@jest/globals": "^25.5.2",
-        "@jest/source-map": "^25.5.0",
-        "@jest/test-result": "^25.5.0",
-        "@jest/transform": "^25.5.1",
-        "@jest/types": "^25.5.0",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^3.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "exit": "^0.1.2",
-        "glob": "^7.1.3",
-<<<<<<< HEAD
-        "graceful-fs": "^4.2.4",
-        "jest-config": "^25.5.4",
-        "jest-haste-map": "^25.5.1",
-        "jest-message-util": "^25.5.0",
-        "jest-mock": "^25.5.0",
-        "jest-regex-util": "^25.2.6",
-        "jest-resolve": "^25.5.1",
-        "jest-snapshot": "^25.5.1",
-        "jest-util": "^25.5.0",
-        "jest-validate": "^25.5.0",
-        "realpath-native": "^2.0.0",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0",
-        "yargs": "^15.3.1"
-      },
-      "dependencies": {
-        "cliui": {
-          "version": "6.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
-          "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^4.2.0",
-            "strip-ansi": "^6.0.0",
-            "wrap-ansi": "^6.2.0"
-          }
-        },
-        "find-up": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^5.0.0",
-            "path-exists": "^4.0.0"
-          }
-        },
-        "get-caller-file": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-          "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-          "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-          "dev": true
-        },
-        "locate-path": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-          "dev": true,
-          "requires": {
-            "p-locate": "^4.1.0"
-          }
-        },
-        "p-locate": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-          "dev": true,
-          "requires": {
-            "p-limit": "^2.2.0"
-          }
-        },
-        "path-exists": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-          "dev": true
-        },
-        "require-main-filename": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-          "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-          "dev": true
-        },
-        "slash": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-          "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "4.2.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-          "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^8.0.0",
-            "is-fullwidth-code-point": "^3.0.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "strip-bom": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
-          "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
-          "dev": true
-        },
-        "wrap-ansi": {
-          "version": "6.2.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-          "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.0.0",
-            "string-width": "^4.1.0",
-            "strip-ansi": "^6.0.0"
-          }
-        },
-        "yargs": {
-          "version": "15.4.1",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
-          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
-          "dev": true,
-          "requires": {
-            "cliui": "^6.0.0",
-            "decamelize": "^1.2.0",
-            "find-up": "^4.1.0",
-            "get-caller-file": "^2.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^2.0.0",
-            "set-blocking": "^2.0.0",
-            "string-width": "^4.2.0",
-            "which-module": "^2.0.0",
-            "y18n": "^4.0.0",
-            "yargs-parser": "^18.1.2"
-          }
-        },
-        "yargs-parser": {
-          "version": "18.1.3",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
-          "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-=======
+        "jest-leak-detector": "^25.5.0",
+        "jest-message-util": "^25.5.0",
+        "jest-resolve": "^25.5.1",
+        "jest-runtime": "^25.5.4",
+        "jest-util": "^25.5.0",
+        "jest-worker": "^25.5.0",
+        "source-map-support": "^0.5.6",
+        "throat": "^5.0.0"
+      }
+    },
+    "jest-runtime": {
+      "version": "25.5.4",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.5.4.tgz",
+      "integrity": "sha512-RWTt8LeWh3GvjYtASH2eezkc8AehVoWKK20udV6n3/gC87wlTbE1kIA+opCvNWyyPeBs6ptYsc6nyHUb1GlUVQ==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^25.5.0",
+        "@jest/environment": "^25.5.0",
+        "@jest/globals": "^25.5.2",
+        "@jest/source-map": "^25.5.0",
+        "@jest/test-result": "^25.5.0",
+        "@jest/transform": "^25.5.1",
+        "@jest/types": "^25.5.0",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^3.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
         "jest-config": "^25.5.4",
         "jest-haste-map": "^25.5.1",
@@ -8759,7 +7555,6 @@
           "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
           "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
           "dev": true
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -8895,20 +7690,6 @@
       "requires": {
         "merge-stream": "^2.0.0",
         "supports-color": "^7.0.0"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "js-tokens": {
@@ -8918,15 +7699,9 @@
       "dev": true
     },
     "js-yaml": {
-<<<<<<< HEAD
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-=======
       "version": "3.14.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
       "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "requires": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -8998,15 +7773,12 @@
       "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
       "dev": true
     },
-<<<<<<< HEAD
-=======
     "json-parse-even-better-errors": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "json-schema": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
@@ -9024,16 +7796,6 @@
       }
     },
     "json-schema-to-typescript": {
-<<<<<<< HEAD
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-8.1.0.tgz",
-      "integrity": "sha512-SGGX82OofMggPDUIO6+GYc14g8bew4ETtEif9G8I9SSXYFVHPSfoNE0AaNcfTFwI/xHSepHRse4aMurAtc8+mw==",
-      "requires": {
-        "@types/json-schema": "^7.0.3",
-        "@types/node": ">=4.5.0",
-        "@types/prettier": "^1.16.1",
-        "cli-color": "^1.4.0",
-=======
       "version": "8.2.0",
       "resolved": "https://registry.npmjs.org/json-schema-to-typescript/-/json-schema-to-typescript-8.2.0.tgz",
       "integrity": "sha512-yvi4v9oLeJzJCktt+Zta6kOgEu8R93gNMZUJYo83aAPxoG0qB+cXIxVg5xa6gmdNkyffjH9Ebw1rvyaJKIor5A==",
@@ -9045,15 +7807,11 @@
         "cli-color": "^1.4.0",
         "glob": "^7.1.4",
         "is-glob": "^4.0.1",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "json-schema-ref-parser": "^6.1.0",
         "json-stringify-safe": "^5.0.1",
         "lodash": "^4.17.11",
         "minimist": "^1.2.0",
-<<<<<<< HEAD
-=======
         "mkdirp": "^0.5.1",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "mz": "^2.7.0",
         "prettier": "^1.19.1",
         "stdin": "0.0.1"
@@ -9095,17 +7853,6 @@
       "dev": true,
       "requires": {
         "minimist": "^1.2.5"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "jsonfile": {
@@ -9257,15 +8004,9 @@
       }
     },
     "lodash": {
-<<<<<<< HEAD
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
-=======
       "version": "4.17.20",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
       "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "lodash.memoize": {
       "version": "4.1.2",
@@ -9334,15 +8075,9 @@
       }
     },
     "loglevel": {
-<<<<<<< HEAD
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz",
-      "integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==",
-=======
       "version": "1.7.0",
       "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz",
       "integrity": "sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true
     },
     "lolex": {
@@ -9365,21 +8100,12 @@
       }
     },
     "lru-cache": {
-<<<<<<< HEAD
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dev": true,
-      "requires": {
-        "yallist": "^3.0.2"
-=======
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
       "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
       "requires": {
         "yallist": "^4.0.0"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "lru-queue": {
@@ -9524,15 +8250,12 @@
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
       "dev": true
     },
-<<<<<<< HEAD
-=======
     "merge2": {
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "methods": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
@@ -9710,20 +8433,11 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "requires": {
         "brace-expansion": "^1.1.7"
       }
     },
     "minimist": {
-<<<<<<< HEAD
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
-=======
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
@@ -9773,7 +8487,6 @@
         "minipass": "^3.0.0",
         "yallist": "^4.0.0"
       }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "mississippi": {
       "version": "3.0.0",
@@ -9815,28 +8528,11 @@
       }
     },
     "mkdirp": {
-<<<<<<< HEAD
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
-=======
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
       "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
       "requires": {
         "minimist": "^1.2.5"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "move-concurrently": {
@@ -9851,8 +8547,6 @@
         "mkdirp": "^0.5.1",
         "rimraf": "^2.5.4",
         "run-queue": "^1.0.3"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "rimraf": {
@@ -9864,7 +8558,6 @@
             "glob": "^7.1.3"
           }
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "ms": {
@@ -9890,16 +8583,9 @@
       "dev": true
     },
     "mute-stream": {
-<<<<<<< HEAD
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-      "dev": true
-=======
       "version": "0.0.8",
       "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
       "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "mz": {
       "version": "2.7.0",
@@ -9911,8 +8597,6 @@
         "thenify-all": "^1.0.0"
       }
     },
-<<<<<<< HEAD
-=======
     "nan": {
       "version": "2.14.1",
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz",
@@ -9920,7 +8604,6 @@
       "dev": true,
       "optional": true
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "nanomatch": {
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
@@ -9970,15 +8653,9 @@
       "dev": true
     },
     "node-forge": {
-<<<<<<< HEAD
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
-      "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
-=======
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
       "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true
     },
     "node-int64": {
@@ -10066,15 +8743,9 @@
       }
     },
     "node-releases": {
-<<<<<<< HEAD
-      "version": "1.1.60",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz",
-      "integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==",
-=======
       "version": "1.1.61",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.61.tgz",
       "integrity": "sha512-DD5vebQLg8jLCOzwupn954fbIiZht05DAZs0k2u8NStSe6h9XdsuIQL8hSRKYiU8WUQRznmSDrKGbv3ObOmC7g==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "optional": true
     },
@@ -10147,8 +8818,6 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
           "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
           "dev": true
-<<<<<<< HEAD
-=======
         },
         "has-flag": {
           "version": "3.0.0",
@@ -10164,7 +8833,6 @@
           "requires": {
             "has-flag": "^3.0.0"
           }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -10238,15 +8906,6 @@
       "dev": true
     },
     "object-is": {
-<<<<<<< HEAD
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
-      "integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.3",
-        "es-abstract": "^1.17.5"
-=======
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.3.tgz",
       "integrity": "sha512-teyqLvFWzLkq5B9ki8FVWA902UER2qkxmdA4nLf+wjOLAWgxzCWZNCxpDq9MvE8MmhWNr+I8w3BN49Vx36Y6Xg==",
@@ -10254,7 +8913,6 @@
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.18.0-next.1"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "object-keys": {
@@ -10273,17 +8931,6 @@
       }
     },
     "object.assign": {
-<<<<<<< HEAD
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-=======
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz",
       "integrity": "sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==",
@@ -10293,7 +8940,6 @@
         "es-abstract": "^1.18.0-next.0",
         "has-symbols": "^1.0.1",
         "object-keys": "^1.1.1"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "object.pick": {
@@ -10330,10 +8976,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-<<<<<<< HEAD
-      "dev": true,
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "requires": {
         "wrappy": "1"
       }
@@ -10390,16 +9032,6 @@
         "mute-stream": "0.0.8",
         "strip-ansi": "^6.0.0",
         "wcwidth": "^1.0.1"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "mute-stream": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-          "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "original": {
@@ -10477,12 +9109,6 @@
       }
     },
     "p-map": {
-<<<<<<< HEAD
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "dev": true
-=======
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
       "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
@@ -10490,7 +9116,6 @@
       "requires": {
         "aggregate-error": "^3.0.0"
       }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "p-retry": {
       "version": "3.0.1",
@@ -10595,12 +9220,7 @@
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-<<<<<<< HEAD
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-=======
       "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "path-is-inside": {
       "version": "1.0.2",
@@ -10627,28 +9247,10 @@
       "dev": true
     },
     "path-type": {
-<<<<<<< HEAD
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-      "dev": true,
-      "requires": {
-        "pify": "^3.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        }
-      }
-=======
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "pbkdf2": {
       "version": "3.1.1",
@@ -10745,24 +9347,6 @@
           "requires": {
             "ms": "^2.1.1"
           }
-<<<<<<< HEAD
-        },
-        "minimist": {
-          "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "dev": true
-        },
-        "mkdirp": {
-          "version": "0.5.5",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
-          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -10794,17 +9378,6 @@
         "ansi-regex": "^5.0.0",
         "ansi-styles": "^4.0.0",
         "react-is": "^16.12.0"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-          "dev": true
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "process": {
@@ -11007,8 +9580,6 @@
         "load-json-file": "^4.0.0",
         "normalize-package-data": "^2.3.2",
         "path-type": "^3.0.0"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "path-type": {
@@ -11026,7 +9597,6 @@
           "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
           "dev": true
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "read-pkg-up": {
@@ -11069,24 +9639,14 @@
           }
         },
         "parse-json": {
-<<<<<<< HEAD
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.1.tgz",
-          "integrity": "sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==",
-=======
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz",
           "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.0.0",
             "error-ex": "^1.3.1",
-<<<<<<< HEAD
-            "json-parse-better-errors": "^1.0.1",
-=======
             "json-parse-even-better-errors": "^2.3.0",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
             "lines-and-columns": "^1.1.6"
           }
         },
@@ -11200,20 +9760,6 @@
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.17.0-next.1"
-<<<<<<< HEAD
-      }
-    },
-    "regexpp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
-      "dev": true
-    },
-    "regexpu-core": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-      "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
-=======
       },
       "dependencies": {
         "es-abstract": {
@@ -11247,7 +9793,6 @@
       "version": "4.7.1",
       "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
       "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "optional": true,
       "requires": {
@@ -11356,17 +9901,6 @@
       "dev": true,
       "requires": {
         "lodash": "^4.17.19"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.20",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz",
-          "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
-          "dev": true
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "request-promise-native": {
@@ -11467,12 +10001,6 @@
       "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
       "dev": true
     },
-<<<<<<< HEAD
-    "rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-=======
     "reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -11483,7 +10011,6 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "requires": {
         "glob": "^7.1.3"
@@ -11511,15 +10038,12 @@
       "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
       "dev": true
     },
-<<<<<<< HEAD
-=======
     "run-parallel": {
       "version": "1.1.9",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz",
       "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==",
       "dev": true
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "run-queue": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
@@ -11606,17 +10130,6 @@
       }
     },
     "schema-utils": {
-<<<<<<< HEAD
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-      "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "@types/json-schema": "^7.0.4",
-        "ajv": "^6.12.2",
-        "ajv-keywords": "^3.4.1"
-=======
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
       "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
@@ -11639,7 +10152,6 @@
             "uri-js": "^4.2.2"
           }
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "select-hose": {
@@ -11649,21 +10161,12 @@
       "dev": true
     },
     "selfsigned": {
-<<<<<<< HEAD
-      "version": "1.10.7",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
-      "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
-      "dev": true,
-      "requires": {
-        "node-forge": "0.9.0"
-=======
       "version": "1.10.8",
       "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz",
       "integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==",
       "dev": true,
       "requires": {
         "node-forge": "^0.10.0"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "semver": {
@@ -11719,12 +10222,6 @@
       }
     },
     "serialize-javascript": {
-<<<<<<< HEAD
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz",
-      "integrity": "sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
-      "dev": true
-=======
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
       "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
@@ -11732,7 +10229,6 @@
       "requires": {
         "randombytes": "^2.1.0"
       }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "serve-index": {
       "version": "1.9.1",
@@ -11893,15 +10389,9 @@
       "dev": true
     },
     "slash": {
-<<<<<<< HEAD
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-      "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-=======
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true
     },
     "slice-ansi": {
@@ -12120,16 +10610,9 @@
       "dev": true
     },
     "source-map": {
-<<<<<<< HEAD
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true
-=======
       "version": "0.7.3",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
       "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "source-map-resolve": {
       "version": "0.5.3",
@@ -12145,21 +10628,13 @@
       }
     },
     "source-map-support": {
-<<<<<<< HEAD
-      "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-      "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
-=======
       "version": "0.5.12",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
       "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "source-map": {
@@ -12168,7 +10643,6 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "source-map-url": {
@@ -12209,15 +10683,9 @@
       }
     },
     "spdx-license-ids": {
-<<<<<<< HEAD
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-=======
       "version": "3.0.6",
       "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz",
       "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "dev": true
     },
     "spdy": {
@@ -12292,21 +10760,12 @@
       }
     },
     "ssri": {
-<<<<<<< HEAD
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
-      "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
-      "dev": true,
-      "requires": {
-        "figgy-pudding": "^3.5.1"
-=======
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.0.tgz",
       "integrity": "sha512-aq/pz989nxVYwn16Tsbj1TqFpD5LLrQxHf5zaHuieFV+R0Bbr4y8qUsOA45hXT/N4/9UNXTarBjnjVmjSOVaAA==",
       "dev": true,
       "requires": {
         "minipass": "^3.1.1"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "stack-utils": {
@@ -12454,8 +10913,6 @@
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.17.0-next.1"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "es-abstract": {
@@ -12477,7 +10934,6 @@
             "string.prototype.trimstart": "^1.0.1"
           }
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "string.prototype.trimend": {
@@ -12488,8 +10944,6 @@
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.17.5"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "es-abstract": {
@@ -12511,7 +10965,6 @@
             "string.prototype.trimstart": "^1.0.1"
           }
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "string.prototype.trimstart": {
@@ -12522,8 +10975,6 @@
       "requires": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.17.5"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "es-abstract": {
@@ -12545,7 +10996,6 @@
             "string.prototype.trimstart": "^1.0.1"
           }
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "string_decoder": {
@@ -12563,16 +11013,6 @@
       "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
       "requires": {
         "ansi-regex": "^5.0.0"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "strip-bom": {
@@ -12596,26 +11036,6 @@
     "strip-json-comments": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-<<<<<<< HEAD
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^3.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-          "dev": true
-        }
-=======
       "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
       "dev": true
     },
@@ -12625,7 +11045,6 @@
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "requires": {
         "has-flag": "^4.0.0"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "supports-hyperlinks": {
@@ -12636,20 +11055,6 @@
       "requires": {
         "has-flag": "^4.0.0",
         "supports-color": "^7.0.0"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "supports-color": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "symbol-tree": {
@@ -12710,8 +11115,6 @@
       "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
       "dev": true
     },
-<<<<<<< HEAD
-=======
     "tar": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz",
@@ -12734,7 +11137,6 @@
         }
       }
     },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     "terminal-link": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
@@ -12771,8 +11173,6 @@
         "commander": "^2.20.0",
         "source-map": "~0.6.1",
         "source-map-support": "~0.5.12"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "source-map": {
@@ -12781,7 +11181,6 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "terser-webpack-plugin": {
@@ -12801,8 +11200,6 @@
         "worker-farm": "^1.7.0"
       },
       "dependencies": {
-<<<<<<< HEAD
-=======
         "cacache": {
           "version": "12.0.4",
           "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
@@ -12850,7 +11247,6 @@
             "glob": "^7.1.3"
           }
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "schema-utils": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
@@ -12862,16 +11258,6 @@
             "ajv-keywords": "^3.1.0"
           }
         },
-<<<<<<< HEAD
-        "serialize-javascript": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
-          "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
-          "dev": true,
-          "requires": {
-            "randombytes": "^2.1.0"
-          }
-=======
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -12892,7 +11278,6 @@
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
           "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
           "dev": true
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -12914,15 +11299,9 @@
       "dev": true
     },
     "thenify": {
-<<<<<<< HEAD
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
-      "integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
-=======
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
       "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "requires": {
         "any-promise": "^1.0.0"
       }
@@ -13158,8 +11537,6 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
           "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
           "dev": true
-<<<<<<< HEAD
-=======
         },
         "has-flag": {
           "version": "3.0.0",
@@ -13175,7 +11552,6 @@
           "requires": {
             "has-flag": "^3.0.0"
           }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -13263,8 +11639,6 @@
           "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
           "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
           "dev": true
-<<<<<<< HEAD
-=======
         },
         "has-flag": {
           "version": "3.0.0",
@@ -13280,20 +11654,13 @@
           "requires": {
             "has-flag": "^3.0.0"
           }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
     "tslib": {
-<<<<<<< HEAD
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
-      "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="
-=======
       "version": "1.13.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
       "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "tslint": {
       "version": "6.0.0",
@@ -13357,8 +11724,6 @@
           "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
           "dev": true
         },
-<<<<<<< HEAD
-=======
         "has-flag": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -13374,7 +11739,6 @@
             "has-flag": "^3.0.0"
           }
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "tsutils": {
           "version": "2.29.0",
           "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
@@ -13594,15 +11958,9 @@
       "dev": true
     },
     "uri-js": {
-<<<<<<< HEAD
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-=======
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.0.tgz",
       "integrity": "sha512-B0yRTzYdUCCn9n+F4+Gh4yIDtMQcaJsmYBDsTSG8g/OejKBodLQ2IHfN3bM7jUsRXndopT7OIXWdYqc1fjmV6g==",
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -13697,17 +12055,6 @@
         "@types/istanbul-lib-coverage": "^2.0.1",
         "convert-source-map": "^1.6.0",
         "source-map": "^0.7.3"
-<<<<<<< HEAD
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.7.3",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz",
-          "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==",
-          "dev": true
-        }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "validate-npm-package-license": {
@@ -13892,15 +12239,11 @@
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
           "dev": true,
-<<<<<<< HEAD
-          "optional": true
-=======
           "optional": true,
           "requires": {
             "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         },
         "glob-parent": {
           "version": "3.1.0",
@@ -14034,8 +12377,6 @@
         "webpack-sources": "^1.4.1"
       },
       "dependencies": {
-<<<<<<< HEAD
-=======
         "eslint-scope": {
           "version": "4.0.3",
           "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
@@ -14046,7 +12387,6 @@
             "estraverse": "^4.1.1"
           }
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "memory-fs": {
           "version": "0.4.1",
           "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -14142,15 +12482,12 @@
         "yargs": "12.0.5"
       },
       "dependencies": {
-<<<<<<< HEAD
-=======
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "anymatch": {
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
@@ -14242,15 +12579,11 @@
           "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
           "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
           "dev": true,
-<<<<<<< HEAD
-          "optional": true
-=======
           "optional": true,
           "requires": {
             "bindings": "^1.5.0",
             "nan": "^2.12.1"
           }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         },
         "glob-parent": {
           "version": "3.1.0",
@@ -14381,19 +12714,6 @@
             "y18n": "^3.2.1 || ^4.0.0",
             "yargs-parser": "^11.1.1"
           }
-<<<<<<< HEAD
-        },
-        "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-=======
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         }
       }
     },
@@ -14430,8 +12750,6 @@
       "requires": {
         "source-list-map": "^2.0.0",
         "source-map": "~0.6.1"
-<<<<<<< HEAD
-=======
       },
       "dependencies": {
         "source-map": {
@@ -14440,7 +12758,6 @@
           "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
           "dev": true
         }
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "websocket-driver": {
@@ -14535,15 +12852,12 @@
         "strip-ansi": "^3.0.1"
       },
       "dependencies": {
-<<<<<<< HEAD
-=======
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
           "dev": true
         },
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -14578,12 +12892,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-<<<<<<< HEAD
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-=======
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
     },
     "write": {
       "version": "1.0.3",
@@ -14640,95 +12949,6 @@
       "dev": true
     },
     "yallist": {
-<<<<<<< HEAD
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-      "dev": true
-    },
-    "yargs": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.1.tgz",
-      "integrity": "sha512-PRU7gJrJaXv3q3yQZ/+/X6KBswZiaQ+zOmdprZcouPYtQgvNU35i+68M4b1ZHLZtYFT5QObFLV+ZkmJYcwKdiw==",
-      "dev": true,
-      "requires": {
-        "cliui": "^4.0.0",
-        "decamelize": "^1.1.1",
-        "find-up": "^2.1.0",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^3.1.0",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^2.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^3.2.1",
-        "yargs-parser": "^9.0.2"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        },
-        "find-up": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
-          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-          "dev": true,
-          "requires": {
-            "locate-path": "^2.0.0"
-          }
-        },
-        "locate-path": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
-          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-          "dev": true,
-          "requires": {
-            "p-locate": "^2.0.0",
-            "path-exists": "^3.0.0"
-          }
-        },
-        "p-limit": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
-          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-          "dev": true,
-          "requires": {
-            "p-try": "^1.0.0"
-          }
-        },
-        "p-locate": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
-          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-          "dev": true,
-          "requires": {
-            "p-limit": "^1.1.0"
-          }
-        },
-        "p-try": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-          "dev": true
-        },
-        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-          "dev": true
-        },
-        "yargs-parser": {
-          "version": "9.0.2",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
-          "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^4.1.0"
-=======
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
@@ -14846,28 +13066,11 @@
           "requires": {
             "camelcase": "^5.0.0",
             "decamelize": "^1.2.0"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
           }
         }
       }
     },
     "yargs-parser": {
-<<<<<<< HEAD
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.0.0.tgz",
-      "integrity": "sha512-+DHejWujTVYeMHLff8U96rLc4uE4Emncoftvn5AjhB1Jw1pWxLzgBUT/WYbPrHmy6YPEBTZQx5myHhVcuuu64g==",
-      "dev": true,
-      "requires": {
-        "camelcase": "^4.1.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
-          "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
-          "dev": true
-        }
-=======
       "version": "11.1.1",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
       "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
@@ -14875,7 +13078,6 @@
       "requires": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
->>>>>>> 92810f3ea12db29198ea86c0c1a8281b64c98d95
       }
     },
     "yn": {