From 0c2c9bce98d22ae476b3084a0d951437421698f4 Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Thu, 7 Dec 2017 14:40:50 -0500
Subject: [PATCH 01/20] Development/debug setup.

---
 3p/nameframe.max.html             | 18 +++++++++++++++++-
 examples/fluid.amp.html           |  6 ++++--
 extensions/amp-a4a/0.1/amp-a4a.js | 10 ++++------
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/3p/nameframe.max.html b/3p/nameframe.max.html
index 49aed4323388..e684dcda70ff 100644
--- a/3p/nameframe.max.html
+++ b/3p/nameframe.max.html
@@ -3,7 +3,10 @@
 <head>
   <meta charset="utf-8">
   <script>
-    window.onload = function() {
+    var writeInHead = false;
+    var waitForOnload = false;
+
+    var render = function() {
       try {
         var name_data = JSON.parse(window.name);
         if (!name_data || !name_data['creative']) {
@@ -21,8 +24,21 @@
         window.name = '';
       }
     };
+
+    if (writeInHead && waitForOnload) {
+      window.onload = render;
+    } else if (writeInHead) {
+      render();
+    }
   </script>
 </head>
 <body style="visibility: hidden;">
+  <script>
+    if (!writeInHead && waitForOnload) {
+      window.onload = render;
+    } else if (!writeInHead) {
+      render();
+    }
+  </script>
 </body>
 </html>
diff --git a/examples/fluid.amp.html b/examples/fluid.amp.html
index 1a7efa2376a7..81d0ef3ec608 100644
--- a/examples/fluid.amp.html
+++ b/examples/fluid.amp.html
@@ -20,10 +20,12 @@
   <body>
     <h1>AMP Static Image DFP Reservation.</h1>
     <p>Tests a static image ad in an AMP page.</p>
-    <div class="artificialfold"></div>
+    <!--<div class="artificialfold"></div>
     <div style="margin-left: 35%; margin-right: 15%; border: 1px red solid">
       <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu0/iu1/iu2" height="fluid"></amp-ad>
     </div>
-    <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu7" height="fluid"></amp-ad>
+    <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu7" height="fluid"></amp-ad>-->
+    <amp-ad type=doubleclick data-slot="/30497360/samfrank_native_v2_a4a" width=320 height=50></amp-ad>
+    <amp-ad data-slot="/701/wpni.amp.opinions/blog/plum-line" height=250 layout=fixed type=doubleclick width=300></amp-ad>
   </body>
 </html>
diff --git a/extensions/amp-a4a/0.1/amp-a4a.js b/extensions/amp-a4a/0.1/amp-a4a.js
index 4b1d099d9442..3ae8b961e29a 100644
--- a/extensions/amp-a4a/0.1/amp-a4a.js
+++ b/extensions/amp-a4a/0.1/amp-a4a.js
@@ -742,9 +742,7 @@ export class AmpA4A extends AMP.BaseElement {
           const {bytes, headers} = responseParts;
           const size = this.extractSize(responseParts.headers);
           this.creativeSize_ = size || this.creativeSize_;
-          if (this.experimentalNonAmpCreativeRenderMethod_ !=
-              XORIGIN_MODE.CLIENT_CACHE &&
-              bytes) {
+          if (bytes) {
             this.creativeBody_ = bytes;
           }
           return this.maybeValidateAmpCreative(bytes, headers);
@@ -994,7 +992,7 @@ export class AmpA4A extends AMP.BaseElement {
         this.handleLifecycleStage_('iframeAlreadyExists');
         return Promise.resolve();
       }
-      if (!creativeMetaData) {
+      if (!creativeMetaData || true) {
         // Non-AMP creative case, will verify ad url existence.
         return this.renderNonAmpCreative();
       }
@@ -1288,7 +1286,7 @@ export class AmpA4A extends AMP.BaseElement {
     const method = this.experimentalNonAmpCreativeRenderMethod_;
     let renderPromise = Promise.resolve(false);
     if ((method == XORIGIN_MODE.SAFEFRAME ||
-         method == XORIGIN_MODE.NAMEFRAME) &&
+         method == XORIGIN_MODE.NAMEFRAME || true) &&
         this.creativeBody_) {
       renderPromise = this.renderViaNameAttrOfXOriginIframe_(
           this.creativeBody_);
@@ -1468,7 +1466,7 @@ export class AmpA4A extends AMP.BaseElement {
    */
   renderViaNameAttrOfXOriginIframe_(creativeBody) {
     /** @type {string} */
-    const method = this.experimentalNonAmpCreativeRenderMethod_;
+    const method = 'nameframe';//this.experimentalNonAmpCreativeRenderMethod_;
     dev().assert(method == XORIGIN_MODE.SAFEFRAME ||
         method == XORIGIN_MODE.NAMEFRAME,
     'Unrecognized A4A cross-domain rendering mode: %s', method);

From c015342c75abaafe56cc98224bdaf55e753dc79e Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Thu, 7 Dec 2017 16:32:27 -0500
Subject: [PATCH 02/20] Basic exp setup.

---
 3p/nameframe.max.html                         | 40 +++++++++++++------
 examples/fluid.amp.html                       |  2 +-
 .../0.1/amp-ad-network-doubleclick-impl.js    | 19 +++++++++
 .../0.1/amp-ad-xorigin-iframe-handler.js      |  2 +-
 4 files changed, 48 insertions(+), 15 deletions(-)

diff --git a/3p/nameframe.max.html b/3p/nameframe.max.html
index e684dcda70ff..a090743242d9 100644
--- a/3p/nameframe.max.html
+++ b/3p/nameframe.max.html
@@ -3,26 +3,40 @@
 <head>
   <meta charset="utf-8">
   <script>
-    var writeInHead = false;
-    var waitForOnload = false;
 
-    var render = function() {
+    var name_data;
+    var writeInHead = true;
+    var waitForOnload = true;
+
+    var tryProtected = function(blockFn) {
       try {
-        var name_data = JSON.parse(window.name);
-        if (!name_data || !name_data['creative']) {
-          throw new Error('Missing or incorrectly formatted JSON ' +
+        blockFn();
+      } catch (err) {
+        window.parent.postMessage(
+            {type: 'no-content', error: err.message}, '*');
+        window.name = '';
+      }
+    };
+
+    tryProtected(function() { debugger;
+      name_data = JSON.parse(window.name);
+      writeInHead = name_data['writeInHead'];
+      waitForOnload = name_data['waitForOnload'];
+      if (!name_data || !name_data['creative']) {
+        throw new Error('Missing or incorrectly formatted JSON ' +
             'input to nameframe');
-        }
+      }
+    });
+
+    var render = function() {
+      tryProtected(function() {
         document.open();
         document.write(name_data['creative']);
         document.close();
         delete name_data['creative'];
         window.name = JSON.stringify(name_data);
-      } catch (err) {
-        window.parent.postMessage(
-          {type: 'no-content', error: err.message}, '*');
-        window.name = '';
-      }
+        debugger;
+      });
     };
 
     if (writeInHead && waitForOnload) {
@@ -32,7 +46,7 @@
     }
   </script>
 </head>
-<body style="visibility: hidden;">
+<body>
   <script>
     if (!writeInHead && waitForOnload) {
       window.onload = render;
diff --git a/examples/fluid.amp.html b/examples/fluid.amp.html
index 81d0ef3ec608..adfbc2acbccf 100644
--- a/examples/fluid.amp.html
+++ b/examples/fluid.amp.html
@@ -25,7 +25,7 @@ <h1>AMP Static Image DFP Reservation.</h1>
       <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu0/iu1/iu2" height="fluid"></amp-ad>
     </div>
     <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu7" height="fluid"></amp-ad>-->
-    <amp-ad type=doubleclick data-slot="/30497360/samfrank_native_v2_a4a" width=320 height=50></amp-ad>
+    <!--<amp-ad type=doubleclick data-slot="/30497360/samfrank_native_v2_a4a" width=320 height=50></amp-ad>-->
     <amp-ad data-slot="/701/wpni.amp.opinions/blog/plum-line" height=250 layout=fixed type=doubleclick width=300></amp-ad>
   </body>
 </html>
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
index 3e207415f7e3..1d5803be1f19 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
@@ -375,6 +375,9 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
 
     /** @private {boolean} */
     this.isIdleRender_ = false;
+
+    /** @private {?{writeInHead: boolean, waitForOnload: boolean}} */
+    this.nameframeExperimentConfig_ = null;
   }
 
   /** @override */
@@ -802,6 +805,19 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
           this.getAmpDoc(), 'amp-analytics');
     }
 
+    const nameframeExperimentConfig = responseHeaders.get('amp-nameframe-exp');
+    if (nameframeExperimentConfig) {
+      nameframeExperimentConfig.split(';').map(config => {
+        switch (config) {
+          case 'waitForOnload':
+          case 'writeInHead':
+            // Both parameters are true by default; we flip those sent back on
+            // the header.
+            this.nameframeExperimentConfig_[config] = false;
+        }
+      });
+    }
+
     if (this.isFluid_) {
       this.fluidImpressionUrl_ = responseHeaders.get('X-AmpImps');
     } else {
@@ -1331,6 +1347,9 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
       attributes['reportCreativeGeometry'] = true;
       attributes['isDifferentSourceWindow'] = false;
       attributes['sentinel'] = this.sentinel;
+    } else {
+      attributes['writeInHead'] = false;
+      attributes['waitForOnload'] = false;
     }
     return attributes;
   }
diff --git a/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js b/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js
index ff093a5afa1b..9ff84aef1eeb 100644
--- a/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js
+++ b/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js
@@ -379,7 +379,7 @@ export class AmpAdXOriginIframeHandler {
     // The iframe may have been removed by the time we resize.
     if (!this.iframe) {
       return;
-    }
+    } debugger;
     postMessageToWindows(
         this.iframe,
         [{win: source, origin}],

From 035300620ac9766e784b169579d867169d567bb8 Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Thu, 7 Dec 2017 16:40:11 -0500
Subject: [PATCH 03/20] Header parsing and stuff.

---
 .../0.1/amp-ad-network-doubleclick-impl.js               | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
index 1d5803be1f19..17c4a135b2ea 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
@@ -376,8 +376,12 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     /** @private {boolean} */
     this.isIdleRender_ = false;
 
-    /** @private {?{writeInHead: boolean, waitForOnload: boolean}} */
-    this.nameframeExperimentConfig_ = null;
+    /** @private {{writeInHead: boolean, waitForOnload: boolean, control: true}} */
+    this.nameframeExperimentConfig_ = {
+      waitForOnload: true,
+      writeInHead: true,
+      control: true,
+    };
   }
 
   /** @override */
@@ -816,6 +820,7 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
             this.nameframeExperimentConfig_[config] = false;
         }
       });
+      this.nameframeExperimentConfig_['control'] = false;
     }
 
     if (this.isFluid_) {

From 43436447684e1ea4e8c4c07f0bbbf2fd4d18634d Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Thu, 7 Dec 2017 16:59:53 -0500
Subject: [PATCH 04/20] Client-side changes fin.

---
 3p/nameframe.max.html                                      | 4 +---
 .../0.1/amp-ad-network-doubleclick-impl.js                 | 7 +++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/3p/nameframe.max.html b/3p/nameframe.max.html
index a090743242d9..b9fbf0140b1b 100644
--- a/3p/nameframe.max.html
+++ b/3p/nameframe.max.html
@@ -3,7 +3,6 @@
 <head>
   <meta charset="utf-8">
   <script>
-
     var name_data;
     var writeInHead = true;
     var waitForOnload = true;
@@ -18,7 +17,7 @@
       }
     };
 
-    tryProtected(function() { debugger;
+    tryProtected(function() {
       name_data = JSON.parse(window.name);
       writeInHead = name_data['writeInHead'];
       waitForOnload = name_data['waitForOnload'];
@@ -35,7 +34,6 @@
         document.close();
         delete name_data['creative'];
         window.name = JSON.stringify(name_data);
-        debugger;
       });
     };
 
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
index 17c4a135b2ea..92541e0847df 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
@@ -809,9 +809,9 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
           this.getAmpDoc(), 'amp-analytics');
     }
 
-    const nameframeExperimentConfig = responseHeaders.get('amp-nameframe-exp');
+    const nameframeExperimentConfig = responseHeaders.get('amp-nameframe-exp') || 'writeInHead';
     if (nameframeExperimentConfig) {
-      nameframeExperimentConfig.split(';').map(config => {
+      nameframeExperimentConfig.split(';').map(config => { debugger;
         switch (config) {
           case 'waitForOnload':
           case 'writeInHead':
@@ -1353,8 +1353,7 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
       attributes['isDifferentSourceWindow'] = false;
       attributes['sentinel'] = this.sentinel;
     } else {
-      attributes['writeInHead'] = false;
-      attributes['waitForOnload'] = false;
+      Object.assign(attributes, this.nameframeExperimentConfig_);
     }
     return attributes;
   }

From 0c237496eeb6b8c14adbf7f8266034d7d84e78f4 Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Fri, 12 Jan 2018 17:05:25 -0500
Subject: [PATCH 05/20] Cleaned PR + tests.

---
 3p/nameframe.max.html                         |   17 +-
 extensions/amp-a4a/0.1/amp-a4a.js             |   10 +-
 .../0.1/amp-ad-network-doubleclick-impl.js    |   20 +-
 .../test-amp-ad-network-doubleclick-impl.js   |   52 +
 .../0.1/amp-ad-xorigin-iframe-handler.js      |    2 +-
 yarn.lock                                     | 1015 ++++++++++++++++-
 6 files changed, 1044 insertions(+), 72 deletions(-)

diff --git a/3p/nameframe.max.html b/3p/nameframe.max.html
index b9fbf0140b1b..4928c075eb17 100644
--- a/3p/nameframe.max.html
+++ b/3p/nameframe.max.html
@@ -4,8 +4,8 @@
   <meta charset="utf-8">
   <script>
     var name_data;
-    var writeInHead = true;
-    var waitForOnload = true;
+    var writeInBody = false;
+    var instantLoad = false;
 
     var tryProtected = function(blockFn) {
       try {
@@ -19,8 +19,8 @@
 
     tryProtected(function() {
       name_data = JSON.parse(window.name);
-      writeInHead = name_data['writeInHead'];
-      waitForOnload = name_data['waitForOnload'];
+      writeInBody = name_data['writeInBody'];
+      instantLoad = name_data['instantLoad'];
       if (!name_data || !name_data['creative']) {
         throw new Error('Missing or incorrectly formatted JSON ' +
             'input to nameframe');
@@ -36,19 +36,18 @@
         window.name = JSON.stringify(name_data);
       });
     };
-
-    if (writeInHead && waitForOnload) {
+    if (!writeInBody && !instantLoad) {
       window.onload = render;
-    } else if (writeInHead) {
+    } else if (!writeInBody) {
       render();
     }
   </script>
 </head>
 <body>
   <script>
-    if (!writeInHead && waitForOnload) {
+    if (writeInBody && !instantLoad) {
       window.onload = render;
-    } else if (!writeInHead) {
+    } else if (writeInBody) {
       render();
     }
   </script>
diff --git a/extensions/amp-a4a/0.1/amp-a4a.js b/extensions/amp-a4a/0.1/amp-a4a.js
index 3ae8b961e29a..4b1d099d9442 100644
--- a/extensions/amp-a4a/0.1/amp-a4a.js
+++ b/extensions/amp-a4a/0.1/amp-a4a.js
@@ -742,7 +742,9 @@ export class AmpA4A extends AMP.BaseElement {
           const {bytes, headers} = responseParts;
           const size = this.extractSize(responseParts.headers);
           this.creativeSize_ = size || this.creativeSize_;
-          if (bytes) {
+          if (this.experimentalNonAmpCreativeRenderMethod_ !=
+              XORIGIN_MODE.CLIENT_CACHE &&
+              bytes) {
             this.creativeBody_ = bytes;
           }
           return this.maybeValidateAmpCreative(bytes, headers);
@@ -992,7 +994,7 @@ export class AmpA4A extends AMP.BaseElement {
         this.handleLifecycleStage_('iframeAlreadyExists');
         return Promise.resolve();
       }
-      if (!creativeMetaData || true) {
+      if (!creativeMetaData) {
         // Non-AMP creative case, will verify ad url existence.
         return this.renderNonAmpCreative();
       }
@@ -1286,7 +1288,7 @@ export class AmpA4A extends AMP.BaseElement {
     const method = this.experimentalNonAmpCreativeRenderMethod_;
     let renderPromise = Promise.resolve(false);
     if ((method == XORIGIN_MODE.SAFEFRAME ||
-         method == XORIGIN_MODE.NAMEFRAME || true) &&
+         method == XORIGIN_MODE.NAMEFRAME) &&
         this.creativeBody_) {
       renderPromise = this.renderViaNameAttrOfXOriginIframe_(
           this.creativeBody_);
@@ -1466,7 +1468,7 @@ export class AmpA4A extends AMP.BaseElement {
    */
   renderViaNameAttrOfXOriginIframe_(creativeBody) {
     /** @type {string} */
-    const method = 'nameframe';//this.experimentalNonAmpCreativeRenderMethod_;
+    const method = this.experimentalNonAmpCreativeRenderMethod_;
     dev().assert(method == XORIGIN_MODE.SAFEFRAME ||
         method == XORIGIN_MODE.NAMEFRAME,
     'Unrecognized A4A cross-domain rendering mode: %s', method);
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
index 92541e0847df..00c45b7e2270 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
@@ -376,11 +376,10 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     /** @private {boolean} */
     this.isIdleRender_ = false;
 
-    /** @private {{writeInHead: boolean, waitForOnload: boolean, control: true}} */
+    /** @private {{instantLoad: boolean, writeInBody: boolean}} */
     this.nameframeExperimentConfig_ = {
-      waitForOnload: true,
-      writeInHead: true,
-      control: true,
+      instantLoad: false,
+      writeInBody: false,
     };
   }
 
@@ -809,18 +808,13 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
           this.getAmpDoc(), 'amp-analytics');
     }
 
-    const nameframeExperimentConfig = responseHeaders.get('amp-nameframe-exp') || 'writeInHead';
+    const nameframeExperimentConfig = responseHeaders.get('amp-nameframe-exp');
     if (nameframeExperimentConfig) {
-      nameframeExperimentConfig.split(';').map(config => { debugger;
-        switch (config) {
-          case 'waitForOnload':
-          case 'writeInHead':
-            // Both parameters are true by default; we flip those sent back on
-            // the header.
-            this.nameframeExperimentConfig_[config] = false;
+      nameframeExperimentConfig.split(';').forEach(config => {
+        if (config == 'instantLoad' || config == 'writeInBody') {
+          this.nameframeExperimentConfig_[config] = true;
         }
       });
-      this.nameframeExperimentConfig_['control'] = false;
     }
 
     if (this.isFluid_) {
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
index 51df828838a1..3b956e6b944b 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
@@ -232,6 +232,58 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
       expect(fireDelayedImpressionsSpy.withArgs(
           'https://c.com?e=f,https://d.com?g=h', true)).to.be.calledOnce;
     });
+
+    it('should initialize refresh manager', () => {
+      impl.extractSize({
+        get(name) {
+          return name == 'amp-force-refresh' ? '30' : undefined;
+        },
+        has(name) {
+          return !!this.get(name);
+        },
+      });
+      expect(impl.element.getAttribute(DATA_ATTR_NAME)).to.equal('30');
+    });
+
+    it('should not override publisher\'s refresh settings', () => {
+      impl.refreshManager_ = {refreshInterval_: '45'};
+      impl.extractSize({
+        get(name) {
+          return name == 'amp-force-refresh' ? '30' : undefined;
+        },
+        has(name) {
+          return !!this.get(name);
+        },
+      });
+      expect(impl.refreshManager_.refreshInterval_).to.equal('45');
+    });
+
+    it('should specify nameframe loading behavior; single arg', () => {
+      impl.extractSize({
+        get(name) {
+          return name == 'amp-nameframe-exp' ? 'instantLoad' : undefined;
+        },
+        has(name) {
+          return !!this.get(name);
+        },
+      });
+      expect(impl.nameframeExperimentConfig_.instantLoad).to.be.true;
+      expect(impl.nameframeExperimentConfig_.writeInBody).to.be.false;
+    });
+
+    it('should specify nameframe loading behavior; two args', () => {
+      impl.extractSize({
+        get(name) {
+          return name == 'amp-nameframe-exp' ?
+              'instantLoad;writeInBody' : undefined;
+        },
+        has(name) {
+          return !!this.get(name);
+        },
+      });
+      expect(impl.nameframeExperimentConfig_.instantLoad).to.be.true;
+      expect(impl.nameframeExperimentConfig_.writeInBody).to.be.true;
+    });
   });
 
   describe('#onCreativeRender', () => {
diff --git a/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js b/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js
index 9ff84aef1eeb..ff093a5afa1b 100644
--- a/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js
+++ b/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js
@@ -379,7 +379,7 @@ export class AmpAdXOriginIframeHandler {
     // The iframe may have been removed by the time we resize.
     if (!this.iframe) {
       return;
-    } debugger;
+    }
     postMessageToWindows(
         this.iframe,
         [{win: source, origin}],
diff --git a/yarn.lock b/yarn.lock
index 5937cd8539dd..922ae299506d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -144,7 +144,15 @@ JSONStream@^1.0.3:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
 
+<<<<<<< HEAD
 abab@^1.0.4:
+=======
+<<<<<<< HEAD
+abab@^1.0.3:
+=======
+abab@^1.0.0:
+>>>>>>> Cleaned PR + tests.
+>>>>>>> Cleaned PR + tests.
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
 
@@ -170,7 +178,11 @@ accepts@~1.2.12, accepts@~1.2.13:
     mime-types "~2.1.6"
     negotiator "0.5.3"
 
+<<<<<<< HEAD
 accepts@~1.3.0, accepts@~1.3.4:
+=======
+accepts@~1.3.0, accepts@~1.3.3, accepts@~1.3.4:
+>>>>>>> Cleaned PR + tests.
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
   dependencies:
@@ -201,9 +213,19 @@ acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
+<<<<<<< HEAD
 acorn@^5.0.0, acorn@^5.0.3, acorn@^5.2.1:
+=======
+<<<<<<< HEAD
+acorn@^5.0.0, acorn@^5.0.3, acorn@^5.1.2, acorn@^5.2.1:
+>>>>>>> Cleaned PR + tests.
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
+=======
+acorn@^5.2.1:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
+>>>>>>> Cleaned PR + tests.
 
 active-x-obfuscator@0.0.1:
   version "0.0.1"
@@ -251,21 +273,42 @@ ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
 
+<<<<<<< HEAD
 ajv@6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
+=======
+<<<<<<< HEAD
+ajv@5.5.2, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+=======
+ajv@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39"
+>>>>>>> Cleaned PR + tests.
+>>>>>>> Cleaned PR + tests.
   dependencies:
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+<<<<<<< HEAD
 ajv@^4.9.1:
+=======
+ajv@^4.7.0, ajv@^4.9.1:
+>>>>>>> Cleaned PR + tests.
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> Cleaned PR + tests.
 ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -275,6 +318,10 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+<<<<<<< HEAD
+=======
+>>>>>>> Cleaned PR + tests.
+>>>>>>> Cleaned PR + tests.
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -323,12 +370,15 @@ ansi-gray@^0.1.1:
   dependencies:
     ansi-wrap "0.1.0"
 
+<<<<<<< HEAD
 ansi-red@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
   dependencies:
     ansi-wrap "0.1.0"
 
+=======
+>>>>>>> Cleaned PR + tests.
 ansi-regex@^0.2.0, ansi-regex@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
@@ -359,7 +409,18 @@ ansi-styles@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
 
+<<<<<<< HEAD
 ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
+=======
+ansi-wrap@0.1.0:
+<<<<<<< HEAD
+=======
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+
+any-promise@^0.1.0:
+>>>>>>> Cleaned PR + tests.
+>>>>>>> Cleaned PR + tests.
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
@@ -534,6 +595,7 @@ array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
 
+<<<<<<< HEAD
 array.prototype.find@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90"
@@ -544,6 +606,11 @@ array.prototype.find@^2.0.4:
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+=======
+arraybuffer.slice@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
+>>>>>>> Cleaned PR + tests.
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
@@ -580,8 +647,12 @@ assert@^1.4.0:
     util "0.10.3"
 
 assertion-error@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
+
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
@@ -633,7 +704,11 @@ async@2.0.1:
   dependencies:
     lodash "^4.8.0"
 
+<<<<<<< HEAD
 async@^2.0.0, async@^2.1.2, async@^2.6.0:
+=======
+async@^2.0.0, async@^2.0.1, async@^2.1.4:
+>>>>>>> Cleaned PR + tests.
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
@@ -1493,7 +1568,15 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
+<<<<<<< HEAD
 bluebird@3.5.1, bluebird@^3.0.0, bluebird@^3.1.1, bluebird@^3.3.0:
+=======
+bluebird@3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.0.5.tgz#2ff9d07c9b3edb29d6d280fe07528365e7ecd392"
+
+bluebird@^3.0.0, bluebird@^3.3.0:
+>>>>>>> Cleaned PR + tests.
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -1501,7 +1584,26 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
 
+<<<<<<< HEAD
 body-parser@1.18.2, body-parser@^1.16.1:
+=======
+body-parser@1.14.2:
+  version "1.14.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.14.2.tgz#1015cb1fe2c443858259581db53332f8d0cf50f9"
+  dependencies:
+    bytes "2.2.0"
+    content-type "~1.0.1"
+    debug "~2.2.0"
+    depd "~1.1.0"
+    http-errors "~1.3.1"
+    iconv-lite "0.4.13"
+    on-finished "~2.3.0"
+    qs "5.2.0"
+    raw-body "~2.1.5"
+    type-is "~1.6.10"
+
+body-parser@^1.16.1:
+>>>>>>> Cleaned PR + tests.
   version "1.18.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
   dependencies:
@@ -1615,6 +1717,16 @@ braces@^2.3.0:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+brcast@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/brcast/-/brcast-2.0.2.tgz#2db16de44140e418dc37fab10beec0369e78dcef"
+
+=======
+>>>>>>> Cleaned PR + tests.
+>>>>>>> Cleaned PR + tests.
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -1704,9 +1816,21 @@ browserify-zlib@~0.2.0:
   dependencies:
     pako "~1.0.5"
 
+<<<<<<< HEAD
 browserify@15.0.0:
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/browserify/-/browserify-15.0.0.tgz#37fa47b46846cddd820e084870a66ff6def5164a"
+=======
+browserify-zlib@~0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+  dependencies:
+    pako "~1.0.5"
+
+browserify@14.4.0:
+  version "14.4.0"
+  resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.4.0.tgz#089a3463af58d0e48d8cd4070b3f74654d5abca9"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     JSONStream "^1.0.3"
     assert "^1.4.0"
@@ -1756,9 +1880,14 @@ browserify@15.0.0:
     vm-browserify "~0.0.1"
     xtend "^4.0.0"
 
+<<<<<<< HEAD
 browserify@^14.0.0, browserify@^14.5.0:
   version "14.5.0"
   resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.5.0.tgz#0bbbce521acd6e4d1d54d8e9365008efb85a9cc5"
+=======
+browserify@^14.0.0:
+  version "14.5.0"
+  resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.5.0.tgz#0bbbce521acd6e4d1d54d8e9365008efb85a9cc5"
   dependencies:
     JSONStream "^1.0.3"
     assert "^1.4.0"
@@ -1808,12 +1937,74 @@ browserify@^14.0.0, browserify@^14.5.0:
     vm-browserify "~0.0.1"
     xtend "^4.0.0"
 
+browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+>>>>>>> Cleaned PR + tests.
+  dependencies:
+    JSONStream "^1.0.3"
+    assert "^1.4.0"
+    browser-pack "^6.0.1"
+    browser-resolve "^1.11.0"
+    browserify-zlib "~0.2.0"
+    buffer "^5.0.2"
+    cached-path-relative "^1.0.0"
+    concat-stream "~1.5.1"
+    console-browserify "^1.1.0"
+    constants-browserify "~1.0.0"
+    crypto-browserify "^3.0.0"
+    defined "^1.0.0"
+    deps-sort "^2.0.0"
+    domain-browser "~1.1.0"
+    duplexer2 "~0.1.2"
+    events "~1.1.0"
+    glob "^7.1.0"
+    has "^1.0.0"
+    htmlescape "^1.1.0"
+    https-browserify "^1.0.0"
+    inherits "~2.0.1"
+    insert-module-globals "^7.0.0"
+    labeled-stream-splicer "^2.0.0"
+    module-deps "^4.0.8"
+    os-browserify "~0.3.0"
+    parents "^1.0.1"
+    path-browserify "~0.0.0"
+    process "~0.11.0"
+    punycode "^1.3.2"
+    querystring-es3 "~0.2.0"
+    read-only-stream "^2.0.0"
+    readable-stream "^2.0.2"
+    resolve "^1.1.4"
+    shasum "^1.0.0"
+    shell-quote "^1.6.1"
+    stream-browserify "^2.0.0"
+    stream-http "^2.0.0"
+    string_decoder "~1.0.0"
+    subarg "^1.0.0"
+    syntax-error "^1.1.1"
+    through2 "^2.0.0"
+    timers-browserify "^1.0.1"
+    tty-browserify "~0.0.0"
+    url "~0.11.0"
+    util "~0.10.1"
+    vm-browserify "~0.0.1"
+    xtend "^4.0.0"
+
+<<<<<<< HEAD
 browserslist@^2.0.0, browserslist@^2.1.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.10.0.tgz#bac5ee1cc69ca9d96403ffb8a3abdc5b6aed6346"
   dependencies:
     caniuse-lite "^1.0.30000780"
     electron-to-chromium "^1.3.28"
+=======
+browserslist@^2.1.2:
+  version "2.11.1"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.1.tgz#02fda29d9a2164b879100126e7b0d0b57e43a7bb"
+  dependencies:
+    caniuse-lite "^1.0.30000789"
+    electron-to-chromium "^1.3.30"
+>>>>>>> Cleaned PR + tests.
 
 browserslist@^2.10.2:
   version "2.11.0"
@@ -1847,9 +2038,15 @@ bufferstreams@1.0.1:
   dependencies:
     readable-stream "^1.0.33"
 
+<<<<<<< HEAD
 buildmail@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
+=======
+bufferstreams@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/bufferstreams/-/bufferstreams-1.1.3.tgz#a8515ac024fa90e8fa7d58c11b13dea1f28abe72"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     addressparser "1.0.1"
     libbase64 "0.1.0"
@@ -1968,6 +2165,7 @@ caniuse-api@^2.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
+<<<<<<< HEAD
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000780:
   version "1.0.30000784"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000784.tgz#129ced74e9a1280a441880b6cd2bce30ef59e6c0"
@@ -1975,6 +2173,15 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000780:
 caniuse-lite@^1.0.30000784:
   version "1.0.30000789"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000789.tgz#2e3d937b267133f63635ef7f441fac66360fc889"
+=======
+caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000613, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+  version "1.0.30000791"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000791.tgz#06787f56caef4300a17e35d137447123bdf536f9"
+
+caniuse-lite@^1.0.30000789:
+  version "1.0.30000791"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000791.tgz#8e35745efd483a3e23bb7d350990326d2319fc16"
+>>>>>>> Cleaned PR + tests.
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -2038,6 +2245,7 @@ chalk@^0.5.0, chalk@^0.5.1:
     strip-ansi "^0.3.0"
     supports-color "^0.2.0"
 
+<<<<<<< HEAD
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -2047,6 +2255,15 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     has-ansi "^2.0.0"
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
+=======
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
+  dependencies:
+    ansi-styles "^3.1.0"
+    escape-string-regexp "^1.0.5"
+    supports-color "^4.0.0"
+>>>>>>> Cleaned PR + tests.
 
 chardet@^0.4.0:
   version "0.4.2"
@@ -2120,15 +2337,32 @@ clap@^1.0.9:
     chalk "^1.1.3"
 
 class-utils@^0.3.5:
+<<<<<<< HEAD
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.5.tgz#17e793103750f9627b2176ea34cfd1b565903c80"
+=======
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
     isobject "^3.0.0"
+<<<<<<< HEAD
     lazy-cache "^2.0.2"
     static-extend "^0.1.1"
 
+<<<<<<< HEAD
+=======
+classnames@^2.2.5:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
+
+=======
+    static-extend "^0.1.1"
+
+>>>>>>> Cleaned PR + tests.
+>>>>>>> Cleaned PR + tests.
 clean-stack@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31"
@@ -2150,6 +2384,16 @@ cli-cursor@^2.1.0:
 cli-spinners@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06"
+<<<<<<< HEAD
+=======
+
+cli-truncate@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
+  dependencies:
+    slice-ansi "0.0.4"
+    string-width "^1.0.1"
+>>>>>>> Cleaned PR + tests.
 
 cli-truncate@^1.0.0:
   version "1.1.0"
@@ -2253,7 +2497,11 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
+<<<<<<< HEAD
 color-convert@^1.8.2, color-convert@^1.9.0:
+=======
+color-convert@^1.3.0, color-convert@^1.9.0:
+>>>>>>> Cleaned PR + tests.
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
   dependencies:
@@ -2273,6 +2521,17 @@ color-string@^1.4.0:
 color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+<<<<<<< HEAD
+=======
+
+color@^0.11.0:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  dependencies:
+    clone "^1.0.2"
+    color-convert "^1.3.0"
+    color-string "^0.3.0"
+>>>>>>> Cleaned PR + tests.
 
 color@^1.0.0:
   version "1.0.3"
@@ -2314,9 +2573,23 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
+<<<<<<< HEAD
 commander@2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+=======
+commander@0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
+
+commander@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"
+
+commander@^2.9.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
+>>>>>>> Cleaned PR + tests.
 
 commander@^2.12.2, commander@^2.9.0, commander@~2.12.1:
   version "2.12.2"
@@ -2338,6 +2611,13 @@ component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
 
+<<<<<<< HEAD
+=======
+component-emitter@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
+
+>>>>>>> Cleaned PR + tests.
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -2533,7 +2813,15 @@ content-type@~1.0.1, content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
+<<<<<<< HEAD
 convert-source-map@1.X, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
+=======
+<<<<<<< HEAD
+convert-source-map@1.X, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0:
+=======
+convert-source-map@^1.0.0, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0:
+>>>>>>> Cleaned PR + tests.
+>>>>>>> Cleaned PR + tests.
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
@@ -2872,6 +3160,23 @@ dateformat@^1.0.6, dateformat@^1.0.7-1.2.3:
     meow "^3.3.0"
 
 dateformat@^2.0.0:
+<<<<<<< HEAD
+=======
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
+
+debug@0.7.4:
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
+
+debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  dependencies:
+    ms "2.0.0"
+
+debug@2.2.0, debug@~2.2.0:
+>>>>>>> Cleaned PR + tests.
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
 
@@ -2941,13 +3246,19 @@ defaults@^1.0.0:
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
   dependencies:
-    foreach "^2.0.5"
-    object-keys "^1.0.8"
+    is-descriptor "^1.0.0"
 
+<<<<<<< HEAD
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -2960,6 +3271,8 @@ define-property@^1.0.0:
   dependencies:
     is-descriptor "^1.0.0"
 
+=======
+>>>>>>> Cleaned PR + tests.
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -3007,7 +3320,7 @@ depd@0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/depd/-/depd-0.4.5.tgz#1a664b53388b4a6573e8ae67b5f767c693ca97f1"
 
-depd@1.1.1, depd@~1.1.0, depd@~1.1.1:
+depd@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
 
@@ -3015,6 +3328,10 @@ depd@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.0.1.tgz#80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"
 
+depd@~1.1.0, depd@~1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+
 deprecated@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
@@ -3049,11 +3366,9 @@ destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
 
-detect-file@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
-  dependencies:
-    fs-exists-sync "^0.1.0"
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
 
 detect-file@^1.0.0:
   version "1.0.0"
@@ -3073,6 +3388,7 @@ detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
+<<<<<<< HEAD
 detect-newline@2.X:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -3090,15 +3406,36 @@ detective@^5.0.2:
   dependencies:
     "@browserify/acorn5-object-spread" "^5.0.1"
     acorn "^5.2.1"
+=======
+detective@^4.0.0:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
+  dependencies:
+    acorn "^5.2.1"
+>>>>>>> Cleaned PR + tests.
     defined "^1.0.0"
 
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
 
+<<<<<<< HEAD
 diff@3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
+=======
+diff-match-patch@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.0.tgz#1cc3c83a490d67f95d91e39f6ad1f2e086b63048"
+
+diff@1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
+
+diff@^3.1.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
+>>>>>>> Cleaned PR + tests.
 
 diff@^3.1.0:
   version "3.4.0"
@@ -3112,7 +3449,19 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+<<<<<<< HEAD
 doctrine@2.1.0, doctrine@^2.1.0:
+=======
+<<<<<<< HEAD
+direction@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/direction/-/direction-1.0.1.tgz#0481cc6eb44b4bb0c00da0ddb10a91469bbffe5d"
+
+=======
+<<<<<<< HEAD
+>>>>>>> Cleaned PR + tests.
+doctrine@2.1.0:
+>>>>>>> Cleaned PR + tests.
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
   dependencies:
@@ -3121,6 +3470,11 @@ doctrine@2.1.0, doctrine@^2.1.0:
 doctrine@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075"
+=======
+doctrine@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     esutils "^2.0.2"
 
@@ -3175,9 +3529,15 @@ duplexer@^0.1.1, duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
+<<<<<<< HEAD
 duplexify@^3.5.0:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd"
+=======
+duplexify@^3.2.0, duplexify@^3.5.0:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -3210,7 +3570,11 @@ electron-releases@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e"
 
+<<<<<<< HEAD
 electron-to-chromium@^1.3.28, electron-to-chromium@^1.3.30:
+=======
+electron-to-chromium@^1.2.0, electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
+>>>>>>> Cleaned PR + tests.
   version "1.3.30"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80"
   dependencies:
@@ -3246,8 +3610,8 @@ encoding@^0.1.11:
     iconv-lite "~0.4.13"
 
 end-of-stream@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
   dependencies:
     once "^1.4.0"
 
@@ -3311,7 +3675,7 @@ equal-length@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/equal-length/-/equal-length-1.0.1.tgz#21ca112d48ab24b4e1e7ffc0e5339d31fdfc274c"
 
-error-ex@^1.2.0:
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
@@ -3324,6 +3688,7 @@ errorhandler@~1.4.2:
     accepts "~1.3.0"
     escape-html "~1.0.3"
 
+<<<<<<< HEAD
 es-abstract@^1.6.1, es-abstract@^1.7.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
@@ -3343,6 +3708,9 @@ es-to-primitive@^1.1.1:
     is-symbol "^1.0.1"
 
 es5-ext@^0.10.14, es5-ext@^0.10.30, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2:
+=======
+es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
+>>>>>>> Cleaned PR + tests.
   version "0.10.37"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3"
   dependencies:
@@ -3350,8 +3718,8 @@ es5-ext@^0.10.14, es5-ext@^0.10.30, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~
     es6-symbol "~3.1.1"
 
 es6-error@^4.0.1, es6-error@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
 
 es6-iterator@^2.0.1, es6-iterator@~2.0.1:
   version "2.0.3"
@@ -3615,7 +3983,11 @@ espower-location-detector@^1.0.0:
     source-map "^0.5.0"
     xtend "^4.0.0"
 
+<<<<<<< HEAD
 espree@^3.5.2:
+=======
+espree@^3.4.0, espree@^3.5.2:
+>>>>>>> Cleaned PR + tests.
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca"
   dependencies:
@@ -3885,8 +4257,26 @@ extglob@^0.3.1:
     is-extglob "^1.0.0"
 
 extglob@^2.0.2:
+<<<<<<< HEAD
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.2.tgz#3290f46208db1b2e8eb8be0c94ed9e6ad80edbe2"
+=======
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.3.tgz#55e019d0c95bf873949c737b7e5172dba84ebb29"
+  dependencies:
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+extract-zip@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.5.0.tgz#92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -3905,7 +4295,15 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
+<<<<<<< HEAD
 fancy-log@1.3.2, fancy-log@^1.1.0, fancy-log@^1.2.0, fancy-log@^1.3.2:
+=======
+<<<<<<< HEAD
+fancy-log@^1.1.0, fancy-log@^1.2.0, fancy-log@^1.3.2:
+=======
+fancy-log@^1.1.0:
+>>>>>>> Cleaned PR + tests.
+>>>>>>> Cleaned PR + tests.
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
   dependencies:
@@ -3994,6 +4392,13 @@ fill-range@^4.0.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
+<<<<<<< HEAD
+=======
+
+filled-array@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/filled-array/-/filled-array-1.1.0.tgz#c3c4f6c663b923459a9aa29912d2d031f1507f84"
+>>>>>>> Cleaned PR + tests.
 
 finalhandler@0.4.0:
   version "0.4.0"
@@ -4016,9 +4421,15 @@ finalhandler@1.0.6:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
+<<<<<<< HEAD
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+=======
+finalhandler@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.6.tgz#007aea33d1a4d3e42017f624848ad58d212f814f"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -4061,14 +4472,26 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
+<<<<<<< HEAD
 findup-sync@^0.4.0:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
+=======
+findup-sync@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.2.1.tgz#e0a90a450075c49466ee513732057514b81e878c"
   dependencies:
-    detect-file "^0.1.0"
-    is-glob "^2.0.1"
-    micromatch "^2.3.7"
-    resolve-dir "^0.1.0"
+    glob "~4.3.0"
+
+findup-sync@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
+>>>>>>> Cleaned PR + tests.
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^3.1.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
 
 findup-sync@^2.0.0:
   version "2.0.0"
@@ -4120,12 +4543,15 @@ fn-name@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
 
+<<<<<<< HEAD
 follow-redirects@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
   dependencies:
     debug "^2.2.0"
 
+=======
+>>>>>>> Cleaned PR + tests.
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -4142,10 +4568,6 @@ for-own@^1.0.0:
   dependencies:
     for-in "^1.0.1"
 
-foreach@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -4262,6 +4684,7 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
+<<<<<<< HEAD
 ftp@~0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
@@ -4270,6 +4693,9 @@ ftp@~0.3.10:
     xregexp "2.0.0"
 
 function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
+=======
+function-bind@^1.0.2:
+>>>>>>> Cleaned PR + tests.
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
@@ -4342,6 +4768,7 @@ get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
+<<<<<<< HEAD
 get-uri@2:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.1.tgz#dbdcacacd8c608a38316869368117697a1631c59"
@@ -4353,6 +4780,8 @@ get-uri@2:
     ftp "~0.3.10"
     readable-stream "2"
 
+=======
+>>>>>>> Cleaned PR + tests.
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -4410,6 +4839,16 @@ glob2base@^0.0.12:
   dependencies:
     find-index "^0.1.1"
 
+<<<<<<< HEAD
+=======
+glob@3.2.11:
+  version "3.2.11"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
+  dependencies:
+    inherits "2"
+    minimatch "0.3"
+
+>>>>>>> Cleaned PR + tests.
 glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -4461,6 +4900,12 @@ global-dirs@^0.1.0:
   dependencies:
     ini "^1.3.4"
 
+global-dirs@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
+  dependencies:
+    ini "^1.3.4"
+
 global-modules@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
@@ -4495,6 +4940,7 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
+<<<<<<< HEAD
 globals@^10.0.0:
   version "10.4.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-10.4.0.tgz#5c477388b128a9e4c5c5d01c7a2aca68c68b2da7"
@@ -4504,6 +4950,9 @@ globals@^11.0.1:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4"
 
 globals@^9.18.0:
+=======
+globals@^9.14.0, globals@^9.17.0, globals@^9.18.0:
+>>>>>>> Cleaned PR + tests.
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
@@ -4932,6 +5381,40 @@ has-unicode@^2.0.0:
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+<<<<<<< HEAD
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has-yarn@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-1.0.0.tgz#89e25db604b725c8f5976fff0addc921b828a5a7"
+
+has@^1.0.0, has@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+=======
+>>>>>>> Cleaned PR + tests.
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -5101,6 +5584,7 @@ http-errors@~1.3.1:
 http-parser-js@>=0.4.0:
   version "0.4.9"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.9.tgz#ea1a04fb64adff0242e9974f297dd4c3cad271e1"
+<<<<<<< HEAD
 
 http-proxy-agent@1:
   version "1.0.0"
@@ -5109,6 +5593,8 @@ http-proxy-agent@1:
     agent-base "2"
     debug "2"
     extend "3"
+=======
+>>>>>>> Cleaned PR + tests.
 
 http-proxy@^0.10:
   version "0.10.4"
@@ -5220,7 +5706,11 @@ ignore-by-default@^1.0.0, ignore-by-default@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
 
+<<<<<<< HEAD
 ignore@^3.3.3:
+=======
+ignore@^3.2.0, ignore@^3.3.3:
+>>>>>>> Cleaned PR + tests.
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
@@ -5385,6 +5875,15 @@ is-accessor-descriptor@^0.1.6:
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
   dependencies:
     kind-of "^3.0.2"
+<<<<<<< HEAD
+=======
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  dependencies:
+    kind-of "^6.0.0"
+>>>>>>> Cleaned PR + tests.
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -5410,16 +5909,13 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
-is-callable@^1.1.1, is-callable@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
-
 is-ci@^1.0.7:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
   dependencies:
     ci-info "^1.0.0"
 
+<<<<<<< HEAD
 is-color-stop@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
@@ -5431,15 +5927,41 @@ is-color-stop@^1.1.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
+=======
+>>>>>>> Cleaned PR + tests.
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
   dependencies:
     kind-of "^3.0.2"
 
+<<<<<<< HEAD
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+=======
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  dependencies:
+    kind-of "^6.0.0"
+
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  dependencies:
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+>>>>>>> Cleaned PR + tests.
 
 is-descriptor@^0.1.0:
   version "0.1.6"
@@ -5509,10 +6031,13 @@ is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
 
+<<<<<<< HEAD
 is-function@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
 
+=======
+>>>>>>> Cleaned PR + tests.
 is-generator-fn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
@@ -5542,7 +6067,11 @@ is-installed-globally@^0.1.0:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
 
+<<<<<<< HEAD
 is-my-json-valid@^2.12.4:
+=======
+is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
+>>>>>>> Cleaned PR + tests.
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471"
   dependencies:
@@ -5581,12 +6110,15 @@ is-observable@^0.2.0:
   dependencies:
     symbol-observable "^0.2.2"
 
+<<<<<<< HEAD
 is-observable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
   dependencies:
     symbol-observable "^1.1.0"
 
+=======
+>>>>>>> Cleaned PR + tests.
 is-odd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-1.0.0.tgz#3b8a932eb028b3775c39bb09e91767accdb69088"
@@ -5639,12 +6171,6 @@ is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
 
-is-regex@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
-  dependencies:
-    has "^1.0.1"
-
 is-relative-url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-relative-url/-/is-relative-url-2.0.0.tgz#72902d7fe04b3d4792e7db15f9db84b7204c9cef"
@@ -5679,6 +6205,7 @@ is-svg@^2.0.0:
   dependencies:
     html-comment-regex "^1.1.0"
 
+<<<<<<< HEAD
 is-symbol@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
@@ -5687,6 +6214,8 @@ is-touch-device@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-touch-device/-/is-touch-device-1.0.1.tgz#9a2fd59f689e9a9bf6ae9a86924c4ba805a42eab"
 
+=======
+>>>>>>> Cleaned PR + tests.
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -5826,6 +6355,13 @@ jison@0.4.18:
     lex-parser "~0.1.3"
     nomnom "1.5.2"
 
+<<<<<<< HEAD
+=======
+js-base64@^2.1.9:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
+
+>>>>>>> Cleaned PR + tests.
 js-string-escape@^1.0.0, js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
@@ -5891,6 +6427,10 @@ jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
+json-parse-better-errors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
+
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
@@ -6143,9 +6683,21 @@ kind-of@^5.0.0, kind-of@^5.0.2:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
 
+<<<<<<< HEAD
 kind-of@^6.0.0:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+=======
+kind-of@^6.0.0, kind-of@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+
+klaw@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
+  optionalDependencies:
+    graceful-fs "^4.1.9"
+>>>>>>> Cleaned PR + tests.
 
 labeled-stream-splicer@^2.0.0:
   version "2.0.0"
@@ -6245,7 +6797,11 @@ liftoff@^2.1.0:
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
+<<<<<<< HEAD
 link-check@^4.3.3:
+=======
+link-check@^4.0.2:
+>>>>>>> Cleaned PR + tests.
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/link-check/-/link-check-4.3.3.tgz#c132453e89f6d9cbb36a114e6c28f3e16e42cf34"
   dependencies:
@@ -6273,6 +6829,15 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
+load-json-file@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^4.0.0"
+    pify "^3.0.0"
+    strip-bom "^3.0.0"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -6670,15 +7235,24 @@ make-error-cause@^1.1.1:
     make-error "^1.2.0"
 
 make-error@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.2.tgz#8762ffad2444dd8ff1f7c819629fa28e24fea1c4"
+
+make-iterator@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.0.tgz#57bef5dc85d23923ba23767324d8e8f8f3d9694b"
+  dependencies:
+    kind-of "^3.1.0"
 
+<<<<<<< HEAD
 make-iterator@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.0.tgz#57bef5dc85d23923ba23767324d8e8f8f3d9694b"
   dependencies:
     kind-of "^3.1.0"
 
+=======
+>>>>>>> Cleaned PR + tests.
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -6698,6 +7272,15 @@ map-stream@~0.1.0:
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+<<<<<<< HEAD
+=======
+  dependencies:
+    object-visit "^1.0.0"
+
+markdown-link-check@3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/markdown-link-check/-/markdown-link-check-3.0.3.tgz#6e2357e822d1254deebfa44e83a1881be86889e2"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     object-visit "^1.0.0"
 
@@ -6714,7 +7297,11 @@ markdown-link-check@3.1.6:
     progress "^2.0.0"
     request "^2.83.0"
 
+<<<<<<< HEAD
 markdown-link-extractor@^1.1.1:
+=======
+markdown-link-extractor@^1.1.0:
+>>>>>>> Cleaned PR + tests.
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/markdown-link-extractor/-/markdown-link-extractor-1.1.1.tgz#30802e25c8fa292fedeb7b2b0286c8d980926e71"
   dependencies:
@@ -6814,7 +7401,11 @@ methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
+<<<<<<< HEAD
 micromatch@^2.1.5, micromatch@^2.3.7, micromatch@^2.3.8:
+=======
+micromatch@^2.1.5:
+>>>>>>> Cleaned PR + tests.
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
@@ -6833,8 +7424,31 @@ micromatch@^2.1.5, micromatch@^2.3.7, micromatch@^2.3.8:
     regex-cache "^0.4.2"
 
 micromatch@^3.0.4:
+<<<<<<< HEAD
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.4.tgz#bb812e741a41f982c854e42b421a7eac458796f4"
+=======
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.5.tgz#d05e168c206472dfbca985bfef4f57797b4cd4ba"
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.0"
+    define-property "^1.0.0"
+    extend-shallow "^2.0.1"
+    extglob "^2.0.2"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.0"
+    nanomatch "^1.2.5"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+miller-rabin@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -6961,6 +7575,20 @@ minimist@~0.0.1:
 mixin-deep@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.0.tgz#47a8732ba97799457c8c1eca28f95132d7e8150a"
+<<<<<<< HEAD
+=======
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
+
+mkdirp@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
@@ -7006,6 +7634,7 @@ module-deps@^4.0.8:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
+<<<<<<< HEAD
 module-deps@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-5.0.1.tgz#3bc47c14b0a6d925aff2ec4a177b456a96ae0396"
@@ -7027,6 +7656,9 @@ module-deps@^5.0.0:
     xtend "^4.0.0"
 
 moment@2.20.1, moment@>=1.6.0, moment@^2.18.1:
+=======
+moment@^2.18.1:
+>>>>>>> Cleaned PR + tests.
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
 
@@ -7069,6 +7701,17 @@ ms@^1.0.0:
 ms@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+<<<<<<< HEAD
+=======
+
+multimatch@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.0.0.tgz#c5ada425357b744ba54842ebdce1c8f0be542b6f"
+  dependencies:
+    array-differ "^1.0.0"
+    array-union "^1.0.1"
+    minimatch "^2.0.1"
+>>>>>>> Cleaned PR + tests.
 
 multimatch@^2.1.0:
   version "2.1.0"
@@ -7105,8 +7748,13 @@ nan@~1.0.0:
   resolved "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz#ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"
 
 nanomatch@^1.2.5:
+<<<<<<< HEAD
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.6.tgz#f27233e97c34a8706b7e781a4bc611c957a81625"
+=======
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.7.tgz#53cd4aa109ff68b7f869591fdc9d10daeeea3e79"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -7119,6 +7767,13 @@ nanomatch@^1.2.5:
     regex-not "^1.0.0"
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
+<<<<<<< HEAD
+=======
+
+native-promise-only@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
+>>>>>>> Cleaned PR + tests.
 
 natives@^1.1.0:
   version "1.1.1"
@@ -7342,7 +7997,11 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
+<<<<<<< HEAD
 nwmatcher@^1.4.3:
+=======
+"nwmatcher@>= 1.3.7 < 2.0.0":
+>>>>>>> Cleaned PR + tests.
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
 
@@ -7369,10 +8028,13 @@ object-copy@^0.1.0:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
     kind-of "^3.0.3"
+<<<<<<< HEAD
 
 object-keys@^1.0.10, object-keys@^1.0.8:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+=======
+>>>>>>> Cleaned PR + tests.
 
 object-keys@~0.4.0:
   version "0.4.0"
@@ -7384,6 +8046,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
+<<<<<<< HEAD
 object.assign@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
@@ -7392,6 +8055,23 @@ object.assign@^4.0.4:
     function-bind "^1.1.0"
     object-keys "^1.0.10"
 
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+object.assign@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.0"
+    object-keys "^1.0.11"
+
+=======
+=======
+>>>>>>> Cleaned PR + tests.
+>>>>>>> Cleaned PR + tests.
+>>>>>>> Cleaned PR + tests.
 object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
@@ -7401,6 +8081,7 @@ object.defaults@^1.1.0:
     for-own "^1.0.0"
     isobject "^3.0.0"
 
+<<<<<<< HEAD
 object.entries@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
@@ -7415,6 +8096,13 @@ object.map@^1.0.0:
   resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.0.tgz#92aef871cd6dcbced31fe29c0921db8395624597"
   dependencies:
     for-own "^0.1.4"
+=======
+object.map@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
+  dependencies:
+    for-own "^1.0.0"
+>>>>>>> Cleaned PR + tests.
     make-iterator "^1.0.0"
 
 object.omit@^2.0.0:
@@ -7532,6 +8220,10 @@ os-browserify@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
 
+os-browserify@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+
 os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
@@ -7568,8 +8260,10 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
 p-limit@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+  dependencies:
+    p-try "^1.0.0"
 
 p-locate@^2.0.0:
   version "2.0.0"
@@ -7577,6 +8271,7 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
+<<<<<<< HEAD
 p-map@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
@@ -7606,6 +8301,13 @@ pac-resolver@~2.0.0:
     thunkify "~2.1.1"
 
 package-hash@^1.2.0:
+=======
+p-try@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+
+package-hash@^1.1.0, package-hash@^1.2.0:
+>>>>>>> Cleaned PR + tests.
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-1.2.0.tgz#003e56cd57b736a6ed6114cc2b81542672770e44"
   dependencies:
@@ -7633,6 +8335,10 @@ pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
 
+pako@~1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+
 parents@^1.0.0, parents@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751"
@@ -7672,6 +8378,13 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
+
 parse-ms@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-0.1.2.tgz#dd3fa25ed6c2efc7bdde12ad9b46c163aa29224e"
@@ -7821,6 +8534,10 @@ performance-now@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
 
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
 performance-now@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
@@ -7854,11 +8571,11 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
 pkg-conf@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.0.0.tgz#071c87650403bccfb9c627f58751bfe47c067279"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.1.0.tgz#2126514ca6f2abfebd168596df18ba57867f0058"
   dependencies:
     find-up "^2.0.0"
-    load-json-file "^2.0.0"
+    load-json-file "^4.0.0"
 
 pkg-dir@^1.0.0:
   version "1.0.0"
@@ -7911,6 +8628,17 @@ policyfile@0.0.4:
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+<<<<<<< HEAD
+=======
+
+postcss-calc@^5.0.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
+  dependencies:
+    postcss "^5.0.2"
+    postcss-message-helpers "^2.0.0"
+    reduce-css-calc "^1.2.6"
+>>>>>>> Cleaned PR + tests.
 
 postcss-calc@^6.0.0:
   version "6.0.1"
@@ -8175,9 +8903,15 @@ postcss@^6.0.0, postcss@^6.0.1:
     source-map "^0.6.1"
     supports-color "^4.4.0"
 
+<<<<<<< HEAD
 postcss@^6.0.15:
   version "6.0.16"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146"
+=======
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.8, postcss@^5.2.11, postcss@^5.2.16:
+  version "5.2.18"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     chalk "^2.3.0"
     source-map "^0.6.1"
@@ -8359,7 +9093,11 @@ q@1.4.1, q@~1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
+<<<<<<< HEAD
 q@^1.1.2, q@^1.4.1, q@^1.5.0:
+=======
+q@^1.1.2, q@^1.4.1:
+>>>>>>> Cleaned PR + tests.
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
@@ -8422,11 +9160,23 @@ randomatic@^1.1.3:
     kind-of "^4.0.0"
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+<<<<<<< HEAD
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
+=======
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
   dependencies:
     safe-buffer "^5.1.0"
 
+randomfill@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62"
+>>>>>>> Cleaned PR + tests.
+  dependencies:
+    randombytes "^2.0.5"
+    safe-buffer "^5.1.0"
+
 randomfill@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62"
@@ -8467,8 +9217,13 @@ raw-body@~2.1.2:
     unpipe "1.0.0"
 
 rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
+<<<<<<< HEAD
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
+=======
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.3.tgz#51575a900f8dd68381c710b4712c2154c3e2035b"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     deep-extend "~0.4.0"
     ini "~1.3.0"
@@ -8869,7 +9624,11 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
+<<<<<<< HEAD
 request@2.83.0, request@^2.0.0, request@^2.74.0, request@^2.83.0:
+=======
+request@^2.55.0, request@^2.79.0, request@^2.83.0:
+>>>>>>> Cleaned PR + tests.
   version "2.83.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
   dependencies:
@@ -8974,7 +9733,11 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
+<<<<<<< HEAD
 resolve-url@^0.2.1, resolve-url@~0.2.1:
+=======
+resolve-url@^0.2.1:
+>>>>>>> Cleaned PR + tests.
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
@@ -9002,6 +9765,7 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+<<<<<<< HEAD
 rgb-regex@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
@@ -9010,6 +9774,8 @@ rgba-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
 
+=======
+>>>>>>> Cleaned PR + tests.
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -9059,7 +9825,11 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
+<<<<<<< HEAD
 samsam@1.x:
+=======
+samsam@1.x, samsam@^1.1.3:
+>>>>>>> Cleaned PR + tests.
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
 
@@ -9122,6 +9892,27 @@ send@0.16.1:
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
   dependencies:
+<<<<<<< HEAD
+=======
+    debug "~2.2.0"
+    depd "~1.1.0"
+    destroy "~1.0.4"
+    encodeurl "~1.0.1"
+    escape-html "~1.0.3"
+    etag "~1.7.0"
+    fresh "0.3.0"
+    http-errors "~1.5.1"
+    mime "1.3.4"
+    ms "0.7.2"
+    on-finished "~2.3.0"
+    range-parser "~1.2.0"
+    statuses "~1.3.1"
+
+send@0.16.1:
+  version "0.16.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
+  dependencies:
+>>>>>>> Cleaned PR + tests.
     debug "2.6.9"
     depd "~1.1.1"
     destroy "~1.0.4"
@@ -9177,7 +9968,11 @@ serve-index@~1.7.2:
     mime-types "~2.1.9"
     parseurl "~1.3.1"
 
+<<<<<<< HEAD
 serve-static@1.13.1, serve-static@^1.3.0:
+=======
+serve-static@^1.3.0:
+>>>>>>> Cleaned PR + tests.
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
   dependencies:
@@ -9226,9 +10021,15 @@ set-value@^2.0.0:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
+<<<<<<< HEAD
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+=======
+setprototypeof@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08"
+>>>>>>> Cleaned PR + tests.
 
 setprototypeof@1.0.3:
   version "1.0.3"
@@ -9321,6 +10122,7 @@ slide@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
 
+<<<<<<< HEAD
 smart-buffer@^1.0.13, smart-buffer@^1.0.4:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
@@ -9332,6 +10134,8 @@ smtp-connection@2.12.0:
     httpntlm "1.6.1"
     nodemailer-shared "1.1.0"
 
+=======
+>>>>>>> Cleaned PR + tests.
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -9465,6 +10269,7 @@ sort-keys@^2.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
+<<<<<<< HEAD
 source-map-resolve@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.3.1.tgz#610f6122a445b8dd51535a2a71b783dfc1248761"
@@ -9474,6 +10279,8 @@ source-map-resolve@^0.3.0:
     source-map-url "~0.3.0"
     urix "~0.1.0"
 
+=======
+>>>>>>> Cleaned PR + tests.
 source-map-resolve@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
@@ -9490,16 +10297,20 @@ source-map-support@^0.4.0, source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
+<<<<<<< HEAD
 source-map-support@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.0.tgz#2018a7ad2bdf8faf2691e5fddab26bed5a2bacab"
   dependencies:
     source-map "^0.6.0"
 
+=======
+>>>>>>> Cleaned PR + tests.
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
+<<<<<<< HEAD
 source-map-url@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
@@ -9514,6 +10325,8 @@ source-map@^0.1.38, source-map@~0.1.33:
   dependencies:
     amdefine ">=0.0.4"
 
+=======
+>>>>>>> Cleaned PR + tests.
 source-map@^0.4.2, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
@@ -9592,10 +10405,13 @@ stack-utils@^1.0.0, stack-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
 
+<<<<<<< HEAD
 standalone-react-addons-pure-render-mixin@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/standalone-react-addons-pure-render-mixin/-/standalone-react-addons-pure-render-mixin-0.1.1.tgz#3c7409f4c79c40de9ac72c616cf679a994f37551"
 
+=======
+>>>>>>> Cleaned PR + tests.
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -9611,6 +10427,7 @@ statuses@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.2.1.tgz#dded45cc18256d51ed40aec142489d5c61026d28"
 
+<<<<<<< HEAD
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
@@ -9619,6 +10436,12 @@ stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
 
+=======
+statuses@~1.3.0, statuses@~1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+
+>>>>>>> Cleaned PR + tests.
 stream-browserify@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -9844,6 +10667,7 @@ supports-color@^3.1.0, supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
+<<<<<<< HEAD
 supports-color@^4.0.0, supports-color@^4.4.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
@@ -9853,6 +10677,11 @@ supports-color@^4.0.0, supports-color@^4.4.0:
 supports-color@^5.0.0, supports-color@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
+=======
+supports-color@^4.0.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
+>>>>>>> Cleaned PR + tests.
   dependencies:
     has-flag "^2.0.0"
 
@@ -9872,7 +10701,11 @@ symbol-observable@^0.2.2:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
 
+<<<<<<< HEAD
 symbol-observable@^1.0.4, symbol-observable@^1.1.0:
+=======
+symbol-observable@^1.0.4:
+>>>>>>> Cleaned PR + tests.
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.1.0.tgz#5c68fd8d54115d9dfb72a84720549222e8db9b32"
 
@@ -9991,6 +10824,16 @@ through2@^0.6.1:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
+<<<<<<< HEAD
+=======
+through2@^2.0.0, through2@^2.0.1, through2@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  dependencies:
+    readable-stream "^2.1.5"
+    xtend "~4.0.1"
+
+>>>>>>> Cleaned PR + tests.
 through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -10104,6 +10947,7 @@ to-regex@^3.0.1:
     extend-shallow "^2.0.1"
     regex-not "^1.0.0"
 
+<<<<<<< HEAD
 touch@3.1.0, touch@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
@@ -10111,6 +10955,15 @@ touch@3.1.0, touch@^3.1.0:
     nopt "~1.0.10"
 
 tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+=======
+touch@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/touch/-/touch-1.0.0.tgz#449cbe2dbae5a8c8038e30d71fa0ff464947c4de"
+  dependencies:
+    nopt "~1.0.10"
+
+tough-cookie@^2.2.0, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+>>>>>>> Cleaned PR + tests.
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
   dependencies:
@@ -10170,7 +11023,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+<<<<<<< HEAD
 type-detect@^4.0.0, type-detect@^4.0.5:
+=======
+type-detect@^4.0.0:
+>>>>>>> Cleaned PR + tests.
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.5.tgz#d70e5bc81db6de2a381bcaca0c6e0cbdc7635de2"
 
@@ -10290,10 +11147,13 @@ underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
 
+<<<<<<< HEAD
 underscore@~1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
 
+=======
+>>>>>>> Cleaned PR + tests.
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@@ -10343,12 +11203,48 @@ unset-value@^1.0.0:
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
+<<<<<<< HEAD
+=======
+
+unzip-response@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
+>>>>>>> Cleaned PR + tests.
 
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
+<<<<<<< HEAD
 update-notifier@^2.1.0, update-notifier@^2.3.0:
+=======
+update-notifier@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-0.5.0.tgz#07b5dc2066b3627ab3b4f530130f7eddda07a4cc"
+  dependencies:
+    chalk "^1.0.0"
+    configstore "^1.0.0"
+    is-npm "^1.0.0"
+    latest-version "^1.0.0"
+    repeating "^1.1.2"
+    semver-diff "^2.0.0"
+    string-length "^1.0.0"
+
+update-notifier@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-0.7.0.tgz#143c4533383d08908ef70546206395fe1b5abb06"
+  dependencies:
+    ansi-align "^1.0.0"
+    boxen "^0.5.1"
+    chalk "^1.0.0"
+    configstore "^2.0.0"
+    is-npm "^1.0.0"
+    latest-version "^2.0.0"
+    semver-diff "^2.0.0"
+    xdg-basedir "^2.0.0"
+
+update-notifier@^2.1.0:
+>>>>>>> Cleaned PR + tests.
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451"
   dependencies:
@@ -10362,7 +11258,18 @@ update-notifier@^2.1.0, update-notifier@^2.3.0:
     semver-diff "^2.0.0"
     xdg-basedir "^3.0.0"
 
+<<<<<<< HEAD
+=======
+upper-case@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+
+<<<<<<< HEAD
+>>>>>>> Cleaned PR + tests.
 urix@^0.1.0, urix@~0.1.0:
+=======
+urix@^0.1.0:
+>>>>>>> Cleaned PR + tests.
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
@@ -10460,7 +11367,11 @@ vary@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.0.1.tgz#99e4981566a286118dfb2b817357df7993376d10"
 
+<<<<<<< HEAD
 vary@~1.1.2:
+=======
+vary@~1.1.0, vary@~1.1.2:
+>>>>>>> Cleaned PR + tests.
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
 
@@ -10606,7 +11517,11 @@ watchify@3.9.0:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
+<<<<<<< HEAD
 wd@^1.4.0:
+=======
+wd@^1.0.0:
+>>>>>>> Cleaned PR + tests.
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/wd/-/wd-1.5.0.tgz#45c96a16ff9f8c0f9e7ca90f806a8b48bd0034d6"
   dependencies:
@@ -10668,11 +11583,15 @@ whet.extend@~0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
 
+<<<<<<< HEAD
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
 which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.14, which@^1.2.9:
+=======
+which@^1.0.9, which@^1.1.1, which@^1.2.12, which@^1.2.14, which@^1.2.9:
+>>>>>>> Cleaned PR + tests.
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -10690,6 +11609,12 @@ widest-line@^2.0.0:
   dependencies:
     string-width "^2.1.1"
 
+widest-line@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
+  dependencies:
+    string-width "^2.1.1"
+
 window-size@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"

From ab8f3b6afb49363ab6b3b70ea7fb52ad4f613642 Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Fri, 12 Jan 2018 17:06:38 -0500
Subject: [PATCH 06/20] Undoing yarn stuff.

---
 yarn.lock | 803 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 748 insertions(+), 55 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 922ae299506d..76d3ea0c1de5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -144,15 +144,24 @@ JSONStream@^1.0.3:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 abab@^1.0.4:
 =======
+=======
+>>>>>>> Undoing yarn stuff.
 <<<<<<< HEAD
 abab@^1.0.3:
 =======
 abab@^1.0.0:
 >>>>>>> Cleaned PR + tests.
+<<<<<<< HEAD
 >>>>>>> Cleaned PR + tests.
+=======
+=======
+abab@^1.0.3:
+>>>>>>> Undoing yarn stuff.
+>>>>>>> Undoing yarn stuff.
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
 
@@ -178,11 +187,15 @@ accepts@~1.2.12, accepts@~1.2.13:
     mime-types "~2.1.6"
     negotiator "0.5.3"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 accepts@~1.3.0, accepts@~1.3.4:
 =======
 accepts@~1.3.0, accepts@~1.3.3, accepts@~1.3.4:
 >>>>>>> Cleaned PR + tests.
+=======
+accepts@~1.3.0, accepts@~1.3.4:
+>>>>>>> Undoing yarn stuff.
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
   dependencies:
@@ -213,9 +226,12 @@ acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 acorn@^5.0.0, acorn@^5.0.3, acorn@^5.2.1:
 =======
+=======
+>>>>>>> Undoing yarn stuff.
 <<<<<<< HEAD
 acorn@^5.0.0, acorn@^5.0.3, acorn@^5.1.2, acorn@^5.2.1:
 >>>>>>> Cleaned PR + tests.
@@ -226,6 +242,11 @@ acorn@^5.2.1:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
 >>>>>>> Cleaned PR + tests.
+=======
+acorn@^5.0.0, acorn@^5.0.3, acorn@^5.1.2, acorn@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
+>>>>>>> Undoing yarn stuff.
 
 active-x-obfuscator@0.0.1:
   version "0.0.1"
@@ -273,11 +294,14 @@ ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 ajv@6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
 =======
+=======
+>>>>>>> Undoing yarn stuff.
 <<<<<<< HEAD
 ajv@5.5.2, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.2"
@@ -287,23 +311,36 @@ ajv@5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39"
 >>>>>>> Cleaned PR + tests.
+<<<<<<< HEAD
 >>>>>>> Cleaned PR + tests.
+=======
+=======
+ajv@5.5.2, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+>>>>>>> Undoing yarn stuff.
+>>>>>>> Undoing yarn stuff.
   dependencies:
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 ajv@^4.9.1:
 =======
 ajv@^4.7.0, ajv@^4.9.1:
 >>>>>>> Cleaned PR + tests.
+=======
+ajv@^4.9.1:
+>>>>>>> Undoing yarn stuff.
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
@@ -322,6 +359,8 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
 =======
 >>>>>>> Cleaned PR + tests.
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -371,14 +410,20 @@ ansi-gray@^0.1.1:
     ansi-wrap "0.1.0"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 ansi-red@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
   dependencies:
     ansi-wrap "0.1.0"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 ansi-regex@^0.2.0, ansi-regex@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
@@ -418,12 +463,15 @@ ansi-wrap@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
+<<<<<<< HEAD
 any-promise@^0.1.0:
 >>>>>>> Cleaned PR + tests.
 >>>>>>> Cleaned PR + tests.
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
+=======
+>>>>>>> Undoing yarn stuff.
 any-shell-escape@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/any-shell-escape/-/any-shell-escape-0.1.1.tgz#d55ab972244c71a9a5e1ab0879f30bf110806959"
@@ -596,6 +644,9 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 array.prototype.find@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90"
@@ -606,11 +657,14 @@ array.prototype.find@^2.0.4:
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
+<<<<<<< HEAD
 =======
 arraybuffer.slice@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
@@ -647,17 +701,20 @@ assert@^1.4.0:
     util "0.10.3"
 
 assertion-error@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
 
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
 
+<<<<<<< HEAD
 assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
 
+=======
+>>>>>>> Undoing yarn stuff.
 ast-replace@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/ast-replace/-/ast-replace-1.1.3.tgz#b9fc248a63fdc67a2656bef6f65d4c1d014d9a8d"
@@ -704,11 +761,15 @@ async@2.0.1:
   dependencies:
     lodash "^4.8.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 async@^2.0.0, async@^2.1.2, async@^2.6.0:
 =======
 async@^2.0.0, async@^2.0.1, async@^2.1.4:
 >>>>>>> Cleaned PR + tests.
+=======
+async@^2.0.0, async@^2.1.2, async@^2.6.0:
+>>>>>>> Undoing yarn stuff.
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
@@ -1568,6 +1629,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 bluebird@3.5.1, bluebird@^3.0.0, bluebird@^3.1.1, bluebird@^3.3.0:
 =======
@@ -1577,6 +1639,9 @@ bluebird@3.0.5:
 
 bluebird@^3.0.0, bluebird@^3.3.0:
 >>>>>>> Cleaned PR + tests.
+=======
+bluebird@3.5.1, bluebird@^3.0.0, bluebird@^3.1.1, bluebird@^3.3.0:
+>>>>>>> Undoing yarn stuff.
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -1584,6 +1649,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 body-parser@1.18.2, body-parser@^1.16.1:
 =======
@@ -1604,6 +1670,9 @@ body-parser@1.14.2:
 
 body-parser@^1.16.1:
 >>>>>>> Cleaned PR + tests.
+=======
+body-parser@1.18.2, body-parser@^1.16.1:
+>>>>>>> Undoing yarn stuff.
   version "1.18.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
   dependencies:
@@ -1717,16 +1786,28 @@ braces@^2.3.0:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
+>>>>>>> Undoing yarn stuff.
 brcast@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/brcast/-/brcast-2.0.2.tgz#2db16de44140e418dc37fab10beec0369e78dcef"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+<<<<<<< HEAD
 >>>>>>> Cleaned PR + tests.
+=======
+=======
+>>>>>>> Undoing yarn stuff.
+>>>>>>> Undoing yarn stuff.
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -1810,6 +1891,7 @@ browserify-sign@^4.0.0:
     inherits "^2.0.1"
     parse-asn1 "^5.0.0"
 
+<<<<<<< HEAD
 browserify-zlib@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
@@ -1821,16 +1903,24 @@ browserify@15.0.0:
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/browserify/-/browserify-15.0.0.tgz#37fa47b46846cddd820e084870a66ff6def5164a"
 =======
+=======
+>>>>>>> Undoing yarn stuff.
 browserify-zlib@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
   dependencies:
     pako "~1.0.5"
 
+<<<<<<< HEAD
 browserify@14.4.0:
   version "14.4.0"
   resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.4.0.tgz#089a3463af58d0e48d8cd4070b3f74654d5abca9"
 >>>>>>> Cleaned PR + tests.
+=======
+browserify@15.0.0:
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/browserify/-/browserify-15.0.0.tgz#37fa47b46846cddd820e084870a66ff6def5164a"
+>>>>>>> Undoing yarn stuff.
   dependencies:
     JSONStream "^1.0.3"
     assert "^1.4.0"
@@ -1880,12 +1970,16 @@ browserify@14.4.0:
     vm-browserify "~0.0.1"
     xtend "^4.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 browserify@^14.0.0, browserify@^14.5.0:
   version "14.5.0"
   resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.5.0.tgz#0bbbce521acd6e4d1d54d8e9365008efb85a9cc5"
 =======
 browserify@^14.0.0:
+=======
+browserify@^14.0.0, browserify@^14.5.0:
+>>>>>>> Undoing yarn stuff.
   version "14.5.0"
   resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.5.0.tgz#0bbbce521acd6e4d1d54d8e9365008efb85a9cc5"
   dependencies:
@@ -1937,6 +2031,7 @@ browserify@^14.0.0:
     vm-browserify "~0.0.1"
     xtend "^4.0.0"
 
+<<<<<<< HEAD
 browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
@@ -2001,11 +2096,24 @@ browserslist@^2.0.0, browserslist@^2.1.2:
 browserslist@^2.1.2:
   version "2.11.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.1.tgz#02fda29d9a2164b879100126e7b0d0b57e43a7bb"
+=======
+browserslist@^2.0.0, browserslist@^2.1.2:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.10.0.tgz#bac5ee1cc69ca9d96403ffb8a3abdc5b6aed6346"
+  dependencies:
+    caniuse-lite "^1.0.30000780"
+    electron-to-chromium "^1.3.28"
+
+browserslist@^2.10.2:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.0.tgz#50350d6873a82ebe0f3ae5483658c571ae5f9d7d"
+>>>>>>> Undoing yarn stuff.
   dependencies:
-    caniuse-lite "^1.0.30000789"
+    caniuse-lite "^1.0.30000784"
     electron-to-chromium "^1.3.30"
 >>>>>>> Cleaned PR + tests.
 
+<<<<<<< HEAD
 browserslist@^2.10.2:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.0.tgz#50350d6873a82ebe0f3ae5483658c571ae5f9d7d"
@@ -2013,6 +2121,8 @@ browserslist@^2.10.2:
     caniuse-lite "^1.0.30000784"
     electron-to-chromium "^1.3.30"
 
+=======
+>>>>>>> Undoing yarn stuff.
 buf-compare@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buf-compare/-/buf-compare-1.0.1.tgz#fef28da8b8113a0a0db4430b0b6467b69730b34a"
@@ -2038,6 +2148,7 @@ bufferstreams@1.0.1:
   dependencies:
     readable-stream "^1.0.33"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 buildmail@4.0.1:
   version "4.0.1"
@@ -2047,6 +2158,11 @@ bufferstreams@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/bufferstreams/-/bufferstreams-1.1.3.tgz#a8515ac024fa90e8fa7d58c11b13dea1f28abe72"
 >>>>>>> Cleaned PR + tests.
+=======
+buildmail@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
+>>>>>>> Undoing yarn stuff.
   dependencies:
     addressparser "1.0.1"
     libbase64 "0.1.0"
@@ -2165,6 +2281,7 @@ caniuse-api@^2.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000780:
   version "1.0.30000784"
@@ -2182,6 +2299,15 @@ caniuse-lite@^1.0.30000789:
   version "1.0.30000791"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000791.tgz#8e35745efd483a3e23bb7d350990326d2319fc16"
 >>>>>>> Cleaned PR + tests.
+=======
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000780:
+  version "1.0.30000784"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000784.tgz#129ced74e9a1280a441880b6cd2bce30ef59e6c0"
+
+caniuse-lite@^1.0.30000784:
+  version "1.0.30000789"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000789.tgz#2e3d937b267133f63635ef7f441fac66360fc889"
+>>>>>>> Undoing yarn stuff.
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -2245,6 +2371,7 @@ chalk@^0.5.0, chalk@^0.5.1:
     strip-ansi "^0.3.0"
     supports-color "^0.2.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
@@ -2264,6 +2391,17 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0:
     escape-string-regexp "^1.0.5"
     supports-color "^4.0.0"
 >>>>>>> Cleaned PR + tests.
+=======
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+>>>>>>> Undoing yarn stuff.
 
 chardet@^0.4.0:
   version "0.4.2"
@@ -2337,6 +2475,7 @@ clap@^1.0.9:
     chalk "^1.1.3"
 
 class-utils@^0.3.5:
+<<<<<<< HEAD
 <<<<<<< HEAD
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.5.tgz#17e793103750f9627b2176ea34cfd1b565903c80"
@@ -2344,10 +2483,15 @@ class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
 >>>>>>> Cleaned PR + tests.
+=======
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.5.tgz#17e793103750f9627b2176ea34cfd1b565903c80"
+>>>>>>> Undoing yarn stuff.
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
     isobject "^3.0.0"
+<<<<<<< HEAD
 <<<<<<< HEAD
     lazy-cache "^2.0.2"
     static-extend "^0.1.1"
@@ -2362,7 +2506,19 @@ classnames@^2.2.5:
     static-extend "^0.1.1"
 
 >>>>>>> Cleaned PR + tests.
+<<<<<<< HEAD
 >>>>>>> Cleaned PR + tests.
+=======
+=======
+    lazy-cache "^2.0.2"
+    static-extend "^0.1.1"
+
+classnames@^2.2.5:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
+
+>>>>>>> Undoing yarn stuff.
+>>>>>>> Undoing yarn stuff.
 clean-stack@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31"
@@ -2387,6 +2543,7 @@ cli-spinners@^1.0.0:
 <<<<<<< HEAD
 =======
 
+<<<<<<< HEAD
 cli-truncate@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
@@ -2395,6 +2552,8 @@ cli-truncate@^0.2.0:
     string-width "^1.0.1"
 >>>>>>> Cleaned PR + tests.
 
+=======
+>>>>>>> Undoing yarn stuff.
 cli-truncate@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086"
@@ -2497,11 +2656,15 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 color-convert@^1.8.2, color-convert@^1.9.0:
 =======
 color-convert@^1.3.0, color-convert@^1.9.0:
 >>>>>>> Cleaned PR + tests.
+=======
+color-convert@^1.8.2, color-convert@^1.9.0:
+>>>>>>> Undoing yarn stuff.
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
   dependencies:
@@ -2524,6 +2687,7 @@ color-support@^1.1.3:
 <<<<<<< HEAD
 =======
 
+<<<<<<< HEAD
 color@^0.11.0:
   version "0.11.4"
   resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
@@ -2533,6 +2697,8 @@ color@^0.11.0:
     color-string "^0.3.0"
 >>>>>>> Cleaned PR + tests.
 
+=======
+>>>>>>> Undoing yarn stuff.
 color@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/color/-/color-1.0.3.tgz#e48e832d85f14ef694fb468811c2d5cfe729b55d"
@@ -2573,6 +2739,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 commander@2.11.0:
   version "2.11.0"
@@ -2591,6 +2758,12 @@ commander@^2.9.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
 >>>>>>> Cleaned PR + tests.
 
+=======
+commander@2.11.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
+
+>>>>>>> Undoing yarn stuff.
 commander@^2.12.2, commander@^2.9.0, commander@~2.12.1:
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
@@ -2611,6 +2784,7 @@ component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 component-emitter@1.1.2:
@@ -2618,6 +2792,8 @@ component-emitter@1.1.2:
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
 
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -2813,15 +2989,24 @@ content-type@~1.0.1, content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 convert-source-map@1.X, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
 =======
+=======
+>>>>>>> Undoing yarn stuff.
 <<<<<<< HEAD
 convert-source-map@1.X, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0:
 =======
 convert-source-map@^1.0.0, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0:
 >>>>>>> Cleaned PR + tests.
+<<<<<<< HEAD
 >>>>>>> Cleaned PR + tests.
+=======
+=======
+convert-source-map@1.X, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0:
+>>>>>>> Undoing yarn stuff.
+>>>>>>> Undoing yarn stuff.
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
@@ -3165,16 +3350,21 @@ dateformat@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
 
-debug@0.7.4:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
+debug-fabulous@1.X:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-1.0.0.tgz#57f6648646097b1b0849dcda0017362c1ec00f8b"
+  dependencies:
+    debug "3.X"
+    memoizee "0.4.X"
+    object-assign "4.X"
 
-debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
+debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
     ms "2.0.0"
 
+<<<<<<< HEAD
 debug@2.2.0, debug@~2.2.0:
 >>>>>>> Cleaned PR + tests.
   version "2.2.0"
@@ -3194,6 +3384,8 @@ debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@~2.6.4, de
   dependencies:
     ms "2.0.0"
 
+=======
+>>>>>>> Undoing yarn stuff.
 debug@3.1.0, debug@3.X, debug@^3.0.1, debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -3246,6 +3438,13 @@ defaults@^1.0.0:
   dependencies:
     clone "^1.0.2"
 
+define-properties@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+  dependencies:
+    foreach "^2.0.5"
+    object-keys "^1.0.8"
+
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -3320,7 +3519,7 @@ depd@0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/depd/-/depd-0.4.5.tgz#1a664b53388b4a6573e8ae67b5f767c693ca97f1"
 
-depd@1.1.1:
+depd@1.1.1, depd@~1.1.0, depd@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
 
@@ -3328,10 +3527,6 @@ depd@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.0.1.tgz#80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"
 
-depd@~1.1.0, depd@~1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-
 deprecated@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
@@ -3366,6 +3561,12 @@ destroy@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
 
+detect-file@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
+  dependencies:
+    fs-exists-sync "^0.1.0"
+
 detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
@@ -3389,10 +3590,14 @@ detect-libc@^1.0.2:
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 detect-newline@2.X:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
 
+<<<<<<< HEAD
 detective@^4.0.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.0.tgz#6276e150f9e50829ad1f90ace4d9a2304188afcf"
@@ -3407,10 +3612,20 @@ detective@^5.0.2:
     "@browserify/acorn5-object-spread" "^5.0.1"
     acorn "^5.2.1"
 =======
+=======
+>>>>>>> Undoing yarn stuff.
 detective@^4.0.0:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e"
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.0.tgz#6276e150f9e50829ad1f90ace4d9a2304188afcf"
+  dependencies:
+    acorn "^5.2.1"
+    defined "^1.0.0"
+
+detective@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-5.0.2.tgz#84ec2e1c581e74211e2ae4ffce1edf52c3263f84"
   dependencies:
+    "@browserify/acorn5-object-spread" "^5.0.1"
     acorn "^5.2.1"
 >>>>>>> Cleaned PR + tests.
     defined "^1.0.0"
@@ -3419,6 +3634,7 @@ di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 diff@3.3.1:
   version "3.3.1"
@@ -3431,6 +3647,11 @@ diff-match-patch@^1.0.0:
 diff@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
+=======
+diff@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
+>>>>>>> Undoing yarn stuff.
 
 diff@^3.1.0:
   version "3.4.0"
@@ -3449,9 +3670,12 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 doctrine@2.1.0, doctrine@^2.1.0:
 =======
+=======
+>>>>>>> Undoing yarn stuff.
 <<<<<<< HEAD
 direction@^1.0.1:
   version "1.0.1"
@@ -3460,6 +3684,9 @@ direction@^1.0.1:
 =======
 <<<<<<< HEAD
 >>>>>>> Cleaned PR + tests.
+=======
+<<<<<<< HEAD
+>>>>>>> Undoing yarn stuff.
 doctrine@2.1.0:
 >>>>>>> Cleaned PR + tests.
   version "2.1.0"
@@ -3472,12 +3699,21 @@ doctrine@^2.0.2:
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075"
 =======
 doctrine@^2.0.0:
+=======
+doctrine@2.1.0:
+>>>>>>> Undoing yarn stuff.
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
 >>>>>>> Cleaned PR + tests.
   dependencies:
     esutils "^2.0.2"
 
+doctrine@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075"
+  dependencies:
+    esutils "^2.0.2"
+
 document-register-element@1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/document-register-element/-/document-register-element-1.5.0.tgz#a91bc20afd9340d50cdb6a493afaf10932c12e00"
@@ -3529,6 +3765,7 @@ duplexer@^0.1.1, duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 duplexify@^3.5.0:
   version "3.5.1"
@@ -3538,6 +3775,11 @@ duplexify@^3.2.0, duplexify@^3.5.0:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e"
 >>>>>>> Cleaned PR + tests.
+=======
+duplexify@^3.5.0:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd"
+>>>>>>> Undoing yarn stuff.
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -3570,11 +3812,15 @@ electron-releases@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 electron-to-chromium@^1.3.28, electron-to-chromium@^1.3.30:
 =======
 electron-to-chromium@^1.2.0, electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
 >>>>>>> Cleaned PR + tests.
+=======
+electron-to-chromium@^1.3.28, electron-to-chromium@^1.3.30:
+>>>>>>> Undoing yarn stuff.
   version "1.3.30"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80"
   dependencies:
@@ -3610,8 +3856,8 @@ encoding@^0.1.11:
     iconv-lite "~0.4.13"
 
 end-of-stream@^1.0.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
   dependencies:
     once "^1.4.0"
 
@@ -3675,7 +3921,7 @@ equal-length@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/equal-length/-/equal-length-1.0.1.tgz#21ca112d48ab24b4e1e7ffc0e5339d31fdfc274c"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.2.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
@@ -3689,6 +3935,9 @@ errorhandler@~1.4.2:
     escape-html "~1.0.3"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 es-abstract@^1.6.1, es-abstract@^1.7.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
@@ -3708,9 +3957,12 @@ es-to-primitive@^1.1.1:
     is-symbol "^1.0.1"
 
 es5-ext@^0.10.14, es5-ext@^0.10.30, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2:
+<<<<<<< HEAD
 =======
 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
   version "0.10.37"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3"
   dependencies:
@@ -3718,8 +3970,8 @@ es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
     es6-symbol "~3.1.1"
 
 es6-error@^4.0.1, es6-error@^4.0.2:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
 
 es6-iterator@^2.0.1, es6-iterator@~2.0.1:
   version "2.0.3"
@@ -3983,11 +4235,15 @@ espower-location-detector@^1.0.0:
     source-map "^0.5.0"
     xtend "^4.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 espree@^3.5.2:
 =======
 espree@^3.4.0, espree@^3.5.2:
 >>>>>>> Cleaned PR + tests.
+=======
+espree@^3.5.2:
+>>>>>>> Undoing yarn stuff.
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca"
   dependencies:
@@ -4257,12 +4513,17 @@ extglob@^0.3.1:
     is-extglob "^1.0.0"
 
 extglob@^2.0.2:
+<<<<<<< HEAD
 <<<<<<< HEAD
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.2.tgz#3290f46208db1b2e8eb8be0c94ed9e6ad80edbe2"
 =======
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.3.tgz#55e019d0c95bf873949c737b7e5172dba84ebb29"
+=======
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.2.tgz#3290f46208db1b2e8eb8be0c94ed9e6ad80edbe2"
+>>>>>>> Undoing yarn stuff.
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -4273,6 +4534,7 @@ extglob@^2.0.2:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+<<<<<<< HEAD
 extract-zip@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.5.0.tgz#92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"
@@ -4287,6 +4549,8 @@ extract-zip@~1.5.0:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+=======
+>>>>>>> Undoing yarn stuff.
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -4295,15 +4559,24 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 fancy-log@1.3.2, fancy-log@^1.1.0, fancy-log@^1.2.0, fancy-log@^1.3.2:
 =======
+=======
+>>>>>>> Undoing yarn stuff.
 <<<<<<< HEAD
 fancy-log@^1.1.0, fancy-log@^1.2.0, fancy-log@^1.3.2:
 =======
 fancy-log@^1.1.0:
 >>>>>>> Cleaned PR + tests.
+<<<<<<< HEAD
 >>>>>>> Cleaned PR + tests.
+=======
+=======
+fancy-log@^1.1.0, fancy-log@^1.2.0, fancy-log@^1.3.2:
+>>>>>>> Undoing yarn stuff.
+>>>>>>> Undoing yarn stuff.
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
   dependencies:
@@ -4395,11 +4668,14 @@ fill-range@^4.0.0:
 <<<<<<< HEAD
 =======
 
+<<<<<<< HEAD
 filled-array@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/filled-array/-/filled-array-1.1.0.tgz#c3c4f6c663b923459a9aa29912d2d031f1507f84"
 >>>>>>> Cleaned PR + tests.
 
+=======
+>>>>>>> Undoing yarn stuff.
 finalhandler@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.4.0.tgz#965a52d9e8d05d2b857548541fb89b53a2497d9b"
@@ -4421,6 +4697,7 @@ finalhandler@1.0.6:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 finalhandler@1.1.0:
   version "1.1.0"
@@ -4430,6 +4707,11 @@ finalhandler@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.6.tgz#007aea33d1a4d3e42017f624848ad58d212f814f"
 >>>>>>> Cleaned PR + tests.
+=======
+finalhandler@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
+>>>>>>> Undoing yarn stuff.
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -4472,6 +4754,7 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 findup-sync@^0.4.0:
   version "0.4.3"
@@ -4480,8 +4763,16 @@ findup-sync@^0.4.0:
 findup-sync@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.2.1.tgz#e0a90a450075c49466ee513732057514b81e878c"
+=======
+findup-sync@^0.4.0:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
+>>>>>>> Undoing yarn stuff.
   dependencies:
-    glob "~4.3.0"
+    detect-file "^0.1.0"
+    is-glob "^2.0.1"
+    micromatch "^2.3.7"
+    resolve-dir "^0.1.0"
 
 findup-sync@^2.0.0:
   version "2.0.0"
@@ -4544,14 +4835,20 @@ fn-name@^2.0.0:
   resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 follow-redirects@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
   dependencies:
     debug "^2.2.0"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -4568,6 +4865,10 @@ for-own@^1.0.0:
   dependencies:
     for-in "^1.0.1"
 
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -4685,6 +4986,9 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
     rimraf "2"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 ftp@~0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
@@ -4693,9 +4997,12 @@ ftp@~0.3.10:
     xregexp "2.0.0"
 
 function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
+<<<<<<< HEAD
 =======
 function-bind@^1.0.2:
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
@@ -4769,6 +5076,9 @@ get-stream@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 get-uri@2:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.1.tgz#dbdcacacd8c608a38316869368117697a1631c59"
@@ -4780,8 +5090,11 @@ get-uri@2:
     ftp "~0.3.10"
     readable-stream "2"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -4839,6 +5152,7 @@ glob2base@^0.0.12:
   dependencies:
     find-index "^0.1.1"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 glob@3.2.11:
@@ -4849,6 +5163,8 @@ glob@3.2.11:
     minimatch "0.3"
 
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -4893,12 +5209,15 @@ global-cache@^1.2.1:
   dependencies:
     define-properties "^1.1.2"
     is-symbol "^1.0.1"
+<<<<<<< HEAD
 
 global-dirs@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
   dependencies:
     ini "^1.3.4"
+=======
+>>>>>>> Undoing yarn stuff.
 
 global-dirs@^0.1.0:
   version "0.1.1"
@@ -4941,6 +5260,9 @@ global-prefix@^1.0.1:
     which "^1.2.14"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 globals@^10.0.0:
   version "10.4.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-10.4.0.tgz#5c477388b128a9e4c5c5d01c7a2aca68c68b2da7"
@@ -4950,9 +5272,12 @@ globals@^11.0.1:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4"
 
 globals@^9.18.0:
+<<<<<<< HEAD
 =======
 globals@^9.14.0, globals@^9.17.0, globals@^9.18.0:
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
@@ -5596,6 +5921,14 @@ http-proxy-agent@1:
 =======
 >>>>>>> Cleaned PR + tests.
 
+http-proxy-agent@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz#cc1ce38e453bf984a0f7702d2dd59c73d081284a"
+  dependencies:
+    agent-base "2"
+    debug "2"
+    extend "3"
+
 http-proxy@^0.10:
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-0.10.4.tgz#14ba0ceaa2197f89fa30dea9e7b09e19cd93c22f"
@@ -5706,11 +6039,15 @@ ignore-by-default@^1.0.0, ignore-by-default@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 ignore@^3.3.3:
 =======
 ignore@^3.2.0, ignore@^3.3.3:
 >>>>>>> Cleaned PR + tests.
+=======
+ignore@^3.3.3:
+>>>>>>> Undoing yarn stuff.
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
@@ -5878,6 +6215,7 @@ is-accessor-descriptor@^0.1.6:
 <<<<<<< HEAD
 =======
 
+<<<<<<< HEAD
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
@@ -5885,6 +6223,8 @@ is-accessor-descriptor@^1.0.0:
     kind-of "^6.0.0"
 >>>>>>> Cleaned PR + tests.
 
+=======
+>>>>>>> Undoing yarn stuff.
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -5909,13 +6249,20 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
+is-callable@^1.1.1, is-callable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+
 is-ci@^1.0.7:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.0.10.tgz#f739336b2632365061a9d48270cd56ae3369318e"
   dependencies:
     ci-info "^1.0.0"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 is-color-stop@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
@@ -5927,14 +6274,18 @@ is-color-stop@^1.1.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
   dependencies:
     kind-of "^3.0.2"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 is-date-object@^1.0.1:
   version "1.0.1"
@@ -5945,6 +6296,11 @@ is-data-descriptor@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
   dependencies:
     kind-of "^6.0.0"
+=======
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+>>>>>>> Undoing yarn stuff.
 
 is-descriptor@^0.1.0:
   version "0.1.6"
@@ -5955,9 +6311,10 @@ is-descriptor@^0.1.0:
     kind-of "^5.0.0"
 
 is-descriptor@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.1.tgz#2c6023599bde2de9d5d2c8b9a9d94082036b6ef2"
   dependencies:
+<<<<<<< HEAD
     is-accessor-descriptor "^1.0.0"
     is-data-descriptor "^1.0.0"
     kind-of "^6.0.2"
@@ -5975,6 +6332,8 @@ is-descriptor@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.1.tgz#2c6023599bde2de9d5d2c8b9a9d94082036b6ef2"
   dependencies:
+=======
+>>>>>>> Undoing yarn stuff.
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
     kind-of "^5.0.0"
@@ -6032,12 +6391,18 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 is-function@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 is-generator-fn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
@@ -6067,11 +6432,15 @@ is-installed-globally@^0.1.0:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 is-my-json-valid@^2.12.4:
 =======
 is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
 >>>>>>> Cleaned PR + tests.
+=======
+is-my-json-valid@^2.12.4:
+>>>>>>> Undoing yarn stuff.
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471"
   dependencies:
@@ -6111,14 +6480,20 @@ is-observable@^0.2.0:
     symbol-observable "^0.2.2"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 is-observable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
   dependencies:
     symbol-observable "^1.1.0"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 is-odd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-1.0.0.tgz#3b8a932eb028b3775c39bb09e91767accdb69088"
@@ -6171,6 +6546,12 @@ is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
 
+is-regex@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  dependencies:
+    has "^1.0.1"
+
 is-relative-url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-relative-url/-/is-relative-url-2.0.0.tgz#72902d7fe04b3d4792e7db15f9db84b7204c9cef"
@@ -6206,6 +6587,9 @@ is-svg@^2.0.0:
     html-comment-regex "^1.1.0"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 is-symbol@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
@@ -6214,8 +6598,11 @@ is-touch-device@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-touch-device/-/is-touch-device-1.0.1.tgz#9a2fd59f689e9a9bf6ae9a86924c4ba805a42eab"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -6355,6 +6742,7 @@ jison@0.4.18:
     lex-parser "~0.1.3"
     nomnom "1.5.2"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 js-base64@^2.1.9:
@@ -6362,6 +6750,8 @@ js-base64@^2.1.9:
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
 
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 js-string-escape@^1.0.0, js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
@@ -6427,10 +6817,6 @@ jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
-json-parse-better-errors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
-
 json-schema-traverse@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
@@ -6683,6 +7069,7 @@ kind-of@^5.0.0, kind-of@^5.0.2:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 kind-of@^6.0.0:
   version "6.0.2"
@@ -6699,6 +7086,12 @@ klaw@^1.0.0:
     graceful-fs "^4.1.9"
 >>>>>>> Cleaned PR + tests.
 
+=======
+kind-of@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+
+>>>>>>> Undoing yarn stuff.
 labeled-stream-splicer@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz#a52e1d138024c00b86b1c0c91f677918b8ae0a59"
@@ -6797,11 +7190,15 @@ liftoff@^2.1.0:
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 link-check@^4.3.3:
 =======
 link-check@^4.0.2:
 >>>>>>> Cleaned PR + tests.
+=======
+link-check@^4.3.3:
+>>>>>>> Undoing yarn stuff.
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/link-check/-/link-check-4.3.3.tgz#c132453e89f6d9cbb36a114e6c28f3e16e42cf34"
   dependencies:
@@ -6829,15 +7226,6 @@ load-json-file@^2.0.0:
     pify "^2.0.0"
     strip-bom "^3.0.0"
 
-load-json-file@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^4.0.0"
-    pify "^3.0.0"
-    strip-bom "^3.0.0"
-
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -7235,8 +7623,8 @@ make-error-cause@^1.1.1:
     make-error "^1.2.0"
 
 make-error@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.2.tgz#8762ffad2444dd8ff1f7c819629fa28e24fea1c4"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.0.tgz#52ad3a339ccf10ce62b4040b708fe707244b8b96"
 
 make-iterator@^1.0.0:
   version "1.0.0"
@@ -7277,6 +7665,7 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+<<<<<<< HEAD
 markdown-link-check@3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/markdown-link-check/-/markdown-link-check-3.0.3.tgz#6e2357e822d1254deebfa44e83a1881be86889e2"
@@ -7288,6 +7677,12 @@ markdown-link-check@3.1.6:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/markdown-link-check/-/markdown-link-check-3.1.6.tgz#436cba78a1690871bb1afa4ec8f8245b0714dca9"
   dependencies:
+=======
+markdown-link-check@3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/markdown-link-check/-/markdown-link-check-3.1.6.tgz#436cba78a1690871bb1afa4ec8f8245b0714dca9"
+  dependencies:
+>>>>>>> Undoing yarn stuff.
     async "^2.6.0"
     chalk "^2.3.0"
     commander "^2.12.2"
@@ -7297,11 +7692,15 @@ markdown-link-check@3.1.6:
     progress "^2.0.0"
     request "^2.83.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 markdown-link-extractor@^1.1.1:
 =======
 markdown-link-extractor@^1.1.0:
 >>>>>>> Cleaned PR + tests.
+=======
+markdown-link-extractor@^1.1.1:
+>>>>>>> Undoing yarn stuff.
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/markdown-link-extractor/-/markdown-link-extractor-1.1.1.tgz#30802e25c8fa292fedeb7b2b0286c8d980926e71"
   dependencies:
@@ -7401,11 +7800,15 @@ methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 micromatch@^2.1.5, micromatch@^2.3.7, micromatch@^2.3.8:
 =======
 micromatch@^2.1.5:
 >>>>>>> Cleaned PR + tests.
+=======
+micromatch@^2.1.5, micromatch@^2.3.7, micromatch@^2.3.8:
+>>>>>>> Undoing yarn stuff.
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
@@ -7424,12 +7827,17 @@ micromatch@^2.1.5:
     regex-cache "^0.4.2"
 
 micromatch@^3.0.4:
+<<<<<<< HEAD
 <<<<<<< HEAD
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.4.tgz#bb812e741a41f982c854e42b421a7eac458796f4"
 =======
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.5.tgz#d05e168c206472dfbca985bfef4f57797b4cd4ba"
+=======
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.4.tgz#bb812e741a41f982c854e42b421a7eac458796f4"
+>>>>>>> Undoing yarn stuff.
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -7581,6 +7989,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+<<<<<<< HEAD
 mkdirp@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
@@ -7593,6 +8002,8 @@ mkdirp@0.5.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
+=======
+>>>>>>> Undoing yarn stuff.
 mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@0.x.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -7635,6 +8046,9 @@ module-deps@^4.0.8:
     xtend "^4.0.0"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 module-deps@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-5.0.1.tgz#3bc47c14b0a6d925aff2ec4a177b456a96ae0396"
@@ -7656,9 +8070,12 @@ module-deps@^5.0.0:
     xtend "^4.0.0"
 
 moment@2.20.1, moment@>=1.6.0, moment@^2.18.1:
+<<<<<<< HEAD
 =======
 moment@^2.18.1:
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
 
@@ -7704,6 +8121,7 @@ ms@^2.0.0:
 <<<<<<< HEAD
 =======
 
+<<<<<<< HEAD
 multimatch@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.0.0.tgz#c5ada425357b744ba54842ebdce1c8f0be542b6f"
@@ -7713,6 +8131,8 @@ multimatch@2.0.0:
     minimatch "^2.0.1"
 >>>>>>> Cleaned PR + tests.
 
+=======
+>>>>>>> Undoing yarn stuff.
 multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -7748,6 +8168,7 @@ nan@~1.0.0:
   resolved "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz#ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"
 
 nanomatch@^1.2.5:
+<<<<<<< HEAD
 <<<<<<< HEAD
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.6.tgz#f27233e97c34a8706b7e781a4bc611c957a81625"
@@ -7755,6 +8176,10 @@ nanomatch@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.7.tgz#53cd4aa109ff68b7f869591fdc9d10daeeea3e79"
 >>>>>>> Cleaned PR + tests.
+=======
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.6.tgz#f27233e97c34a8706b7e781a4bc611c957a81625"
+>>>>>>> Undoing yarn stuff.
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -7770,11 +8195,14 @@ nanomatch@^1.2.5:
 <<<<<<< HEAD
 =======
 
+<<<<<<< HEAD
 native-promise-only@^0.8.1:
   version "0.8.1"
   resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
 >>>>>>> Cleaned PR + tests.
 
+=======
+>>>>>>> Undoing yarn stuff.
 natives@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.1.tgz#011acce1f7cbd87f7ba6b3093d6cd9392be1c574"
@@ -7997,11 +8425,15 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 nwmatcher@^1.4.3:
 =======
 "nwmatcher@>= 1.3.7 < 2.0.0":
 >>>>>>> Cleaned PR + tests.
+=======
+nwmatcher@^1.4.3:
+>>>>>>> Undoing yarn stuff.
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
 
@@ -8036,6 +8468,10 @@ object-keys@^1.0.10, object-keys@^1.0.8:
 =======
 >>>>>>> Cleaned PR + tests.
 
+object-keys@^1.0.10, object-keys@^1.0.8:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+
 object-keys@~0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
@@ -8047,6 +8483,9 @@ object-visit@^1.0.0:
     isobject "^3.0.0"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 object.assign@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
@@ -8056,7 +8495,10 @@ object.assign@^4.0.4:
     object-keys "^1.0.10"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
 =======
+>>>>>>> Undoing yarn stuff.
 <<<<<<< HEAD
 object.assign@^4.1.0:
   version "4.1.0"
@@ -8067,11 +8509,18 @@ object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
+=======
+>>>>>>> Undoing yarn stuff.
 =======
 =======
 >>>>>>> Cleaned PR + tests.
 >>>>>>> Cleaned PR + tests.
+<<<<<<< HEAD
 >>>>>>> Cleaned PR + tests.
+=======
+=======
+>>>>>>> Undoing yarn stuff.
+>>>>>>> Undoing yarn stuff.
 object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
@@ -8082,6 +8531,9 @@ object.defaults@^1.1.0:
     isobject "^3.0.0"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 object.entries@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
@@ -8091,18 +8543,25 @@ object.entries@^1.0.4:
     function-bind "^1.1.0"
     has "^1.0.1"
 
+<<<<<<< HEAD
 object.map@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.0.tgz#92aef871cd6dcbced31fe29c0921db8395624597"
   dependencies:
     for-own "^0.1.4"
 =======
+=======
+>>>>>>> Undoing yarn stuff.
 object.map@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.0.tgz#92aef871cd6dcbced31fe29c0921db8395624597"
   dependencies:
+<<<<<<< HEAD
     for-own "^1.0.0"
 >>>>>>> Cleaned PR + tests.
+=======
+    for-own "^0.1.4"
+>>>>>>> Undoing yarn stuff.
     make-iterator "^1.0.0"
 
 object.omit@^2.0.0:
@@ -8216,10 +8675,13 @@ ordered-read-streams@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
 
+<<<<<<< HEAD
 os-browserify@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
 
+=======
+>>>>>>> Undoing yarn stuff.
 os-browserify@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
@@ -8260,10 +8722,8 @@ p-finally@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
 
 p-limit@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
-  dependencies:
-    p-try "^1.0.0"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
 
 p-locate@^2.0.0:
   version "2.0.0"
@@ -8271,6 +8731,7 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 p-map@^1.1.1:
   version "1.2.0"
@@ -8308,6 +8769,37 @@ p-try@^1.0.0:
 
 package-hash@^1.1.0, package-hash@^1.2.0:
 >>>>>>> Cleaned PR + tests.
+=======
+p-map@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+
+pac-proxy-agent@1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz#34a385dfdf61d2f0ecace08858c745d3e791fd4d"
+  dependencies:
+    agent-base "2"
+    debug "2"
+    extend "3"
+    get-uri "2"
+    http-proxy-agent "1"
+    https-proxy-agent "1"
+    pac-resolver "~2.0.0"
+    raw-body "2"
+    socks-proxy-agent "2"
+
+pac-resolver@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-2.0.0.tgz#99b88d2f193fbdeefc1c9a529c1f3260ab5277cd"
+  dependencies:
+    co "~3.0.6"
+    degenerator "~1.0.2"
+    ip "1.0.1"
+    netmask "~1.0.4"
+    thunkify "~2.1.1"
+
+package-hash@^1.2.0:
+>>>>>>> Undoing yarn stuff.
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-1.2.0.tgz#003e56cd57b736a6ed6114cc2b81542672770e44"
   dependencies:
@@ -8331,10 +8823,13 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
+<<<<<<< HEAD
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
 
+=======
+>>>>>>> Undoing yarn stuff.
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
@@ -8378,13 +8873,6 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
-parse-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
-  dependencies:
-    error-ex "^1.3.1"
-    json-parse-better-errors "^1.0.1"
-
 parse-ms@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-0.1.2.tgz#dd3fa25ed6c2efc7bdde12ad9b46c163aa29224e"
@@ -8530,10 +9018,13 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+<<<<<<< HEAD
 performance-now@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
 
+=======
+>>>>>>> Undoing yarn stuff.
 performance-now@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
@@ -8571,11 +9062,11 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
 pkg-conf@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.1.0.tgz#2126514ca6f2abfebd168596df18ba57867f0058"
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-conf/-/pkg-conf-2.0.0.tgz#071c87650403bccfb9c627f58751bfe47c067279"
   dependencies:
     find-up "^2.0.0"
-    load-json-file "^4.0.0"
+    load-json-file "^2.0.0"
 
 pkg-dir@^1.0.0:
   version "1.0.0"
@@ -8631,6 +9122,7 @@ posix-character-classes@^0.1.0:
 <<<<<<< HEAD
 =======
 
+<<<<<<< HEAD
 postcss-calc@^5.0.0:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
@@ -8640,6 +9132,8 @@ postcss-calc@^5.0.0:
     reduce-css-calc "^1.2.6"
 >>>>>>> Cleaned PR + tests.
 
+=======
+>>>>>>> Undoing yarn stuff.
 postcss-calc@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-6.0.1.tgz#3d24171bbf6e7629d422a436ebfe6dd9511f4330"
@@ -8903,6 +9397,7 @@ postcss@^6.0.0, postcss@^6.0.1:
     source-map "^0.6.1"
     supports-color "^4.4.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 postcss@^6.0.15:
   version "6.0.16"
@@ -8912,6 +9407,11 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0
   version "5.2.18"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
 >>>>>>> Cleaned PR + tests.
+=======
+postcss@^6.0.15:
+  version "6.0.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146"
+>>>>>>> Undoing yarn stuff.
   dependencies:
     chalk "^2.3.0"
     source-map "^0.6.1"
@@ -9009,6 +9509,30 @@ promise-pjs@1.1.3:
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+<<<<<<< HEAD
+  dependencies:
+    asap "~2.0.3"
+
+prop-types-exact@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.1.1.tgz#c2620207e4f77f9762fa1835b0387a464bd08978"
+  dependencies:
+    has "^1.0.1"
+    object.assign "^4.0.4"
+
+prop-types@15.6.0, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0:
+  version "15.6.0"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
+proxy-addr@~2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
+  dependencies:
+=======
   dependencies:
     asap "~2.0.3"
 
@@ -9031,6 +9555,7 @@ proxy-addr@~2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
   dependencies:
+>>>>>>> Undoing yarn stuff.
     forwarded "~0.1.2"
     ipaddr.js "1.5.2"
 
@@ -9093,11 +9618,15 @@ q@1.4.1, q@~1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 q@^1.1.2, q@^1.4.1, q@^1.5.0:
 =======
 q@^1.1.2, q@^1.4.1:
 >>>>>>> Cleaned PR + tests.
+=======
+q@^1.1.2, q@^1.4.1, q@^1.5.0:
+>>>>>>> Undoing yarn stuff.
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
@@ -9160,12 +9689,17 @@ randomatic@^1.1.3:
     kind-of "^4.0.0"
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
+<<<<<<< HEAD
 <<<<<<< HEAD
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
 =======
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+=======
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
+>>>>>>> Undoing yarn stuff.
   dependencies:
     safe-buffer "^5.1.0"
 
@@ -9217,6 +9751,7 @@ raw-body@~2.1.2:
     unpipe "1.0.0"
 
 rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
+<<<<<<< HEAD
 <<<<<<< HEAD
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
@@ -9224,6 +9759,10 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.3.tgz#51575a900f8dd68381c710b4712c2154c3e2035b"
 >>>>>>> Cleaned PR + tests.
+=======
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
+>>>>>>> Undoing yarn stuff.
   dependencies:
     deep-extend "~0.4.0"
     ini "~1.3.0"
@@ -9624,11 +10163,15 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 request@2.83.0, request@^2.0.0, request@^2.74.0, request@^2.83.0:
 =======
 request@^2.55.0, request@^2.79.0, request@^2.83.0:
 >>>>>>> Cleaned PR + tests.
+=======
+request@2.83.0, request@^2.0.0, request@^2.74.0, request@^2.83.0:
+>>>>>>> Undoing yarn stuff.
   version "2.83.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
   dependencies:
@@ -9733,11 +10276,15 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 resolve-url@^0.2.1, resolve-url@~0.2.1:
 =======
 resolve-url@^0.2.1:
 >>>>>>> Cleaned PR + tests.
+=======
+resolve-url@^0.2.1, resolve-url@~0.2.1:
+>>>>>>> Undoing yarn stuff.
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
@@ -9766,6 +10313,9 @@ restore-cursor@^2.0.0:
     signal-exit "^3.0.2"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 rgb-regex@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
@@ -9774,8 +10324,11 @@ rgba-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -9825,11 +10378,15 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 samsam@1.x:
 =======
 samsam@1.x, samsam@^1.1.3:
 >>>>>>> Cleaned PR + tests.
+=======
+samsam@1.x:
+>>>>>>> Undoing yarn stuff.
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
 
@@ -9888,6 +10445,7 @@ send@0.13.2:
     range-parser "~1.0.3"
     statuses "~1.2.1"
 
+<<<<<<< HEAD
 send@0.16.1:
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
@@ -9908,6 +10466,8 @@ send@0.16.1:
     range-parser "~1.2.0"
     statuses "~1.3.1"
 
+=======
+>>>>>>> Undoing yarn stuff.
 send@0.16.1:
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
@@ -9968,11 +10528,15 @@ serve-index@~1.7.2:
     mime-types "~2.1.9"
     parseurl "~1.3.1"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 serve-static@1.13.1, serve-static@^1.3.0:
 =======
 serve-static@^1.3.0:
 >>>>>>> Cleaned PR + tests.
+=======
+serve-static@1.13.1, serve-static@^1.3.0:
+>>>>>>> Undoing yarn stuff.
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
   dependencies:
@@ -10021,6 +10585,7 @@ set-value@^2.0.0:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 setimmediate@^1.0.5:
   version "1.0.5"
@@ -10030,6 +10595,11 @@ setprototypeof@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08"
 >>>>>>> Cleaned PR + tests.
+=======
+setimmediate@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+>>>>>>> Undoing yarn stuff.
 
 setprototypeof@1.0.3:
   version "1.0.3"
@@ -10123,6 +10693,9 @@ slide@^1.1.5:
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 smart-buffer@^1.0.13, smart-buffer@^1.0.4:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
@@ -10134,8 +10707,11 @@ smtp-connection@2.12.0:
     httpntlm "1.6.1"
     nodemailer-shared "1.1.0"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -10246,6 +10822,19 @@ socks-proxy-agent@2:
 socks@1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.9.tgz#628d7e4d04912435445ac0b6e459376cb3e6d691"
+<<<<<<< HEAD
+  dependencies:
+    ip "^1.1.2"
+    smart-buffer "^1.0.4"
+
+socks@~1.1.5:
+  version "1.1.10"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.10.tgz#5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"
+  dependencies:
+    ip "^1.1.4"
+    smart-buffer "^1.0.13"
+
+=======
   dependencies:
     ip "^1.1.2"
     smart-buffer "^1.0.4"
@@ -10257,6 +10846,7 @@ socks@~1.1.5:
     ip "^1.1.4"
     smart-buffer "^1.0.13"
 
+>>>>>>> Undoing yarn stuff.
 sort-keys@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
@@ -10270,6 +10860,9 @@ sort-keys@^2.0.0:
     is-plain-obj "^1.0.0"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 source-map-resolve@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.3.1.tgz#610f6122a445b8dd51535a2a71b783dfc1248761"
@@ -10279,8 +10872,11 @@ source-map-resolve@^0.3.0:
     source-map-url "~0.3.0"
     urix "~0.1.0"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 source-map-resolve@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
@@ -10298,19 +10894,28 @@ source-map-support@^0.4.0, source-map-support@^0.4.15:
     source-map "^0.5.6"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 source-map-support@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.0.tgz#2018a7ad2bdf8faf2691e5fddab26bed5a2bacab"
   dependencies:
     source-map "^0.6.0"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 source-map-url@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
@@ -10325,8 +10930,11 @@ source-map@^0.1.38, source-map@~0.1.33:
   dependencies:
     amdefine ">=0.0.4"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 source-map@^0.4.2, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
@@ -10406,12 +11014,18 @@ stack-utils@^1.0.0, stack-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 standalone-react-addons-pure-render-mixin@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/standalone-react-addons-pure-render-mixin/-/standalone-react-addons-pure-render-mixin-0.1.1.tgz#3c7409f4c79c40de9ac72c616cf679a994f37551"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -10427,6 +11041,7 @@ statuses@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.2.1.tgz#dded45cc18256d51ed40aec142489d5c61026d28"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 statuses@~1.3.1:
   version "1.3.1"
@@ -10442,6 +11057,16 @@ statuses@~1.3.0, statuses@~1.3.1:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
 >>>>>>> Cleaned PR + tests.
+=======
+statuses@~1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
+
+stealthy-require@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+
+>>>>>>> Undoing yarn stuff.
 stream-browserify@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -10667,6 +11292,7 @@ supports-color@^3.1.0, supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 supports-color@^4.0.0, supports-color@^4.4.0:
   version "4.5.0"
@@ -10679,12 +11305,21 @@ supports-color@^5.0.0, supports-color@^5.1.0:
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
 =======
 supports-color@^4.0.0:
+=======
+supports-color@^4.0.0, supports-color@^4.4.0:
+>>>>>>> Undoing yarn stuff.
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
 >>>>>>> Cleaned PR + tests.
   dependencies:
     has-flag "^2.0.0"
 
+supports-color@^5.0.0, supports-color@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
+  dependencies:
+    has-flag "^2.0.0"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -10701,11 +11336,15 @@ symbol-observable@^0.2.2:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 symbol-observable@^1.0.4, symbol-observable@^1.1.0:
 =======
 symbol-observable@^1.0.4:
 >>>>>>> Cleaned PR + tests.
+=======
+symbol-observable@^1.0.4, symbol-observable@^1.1.0:
+>>>>>>> Undoing yarn stuff.
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.1.0.tgz#5c68fd8d54115d9dfb72a84720549222e8db9b32"
 
@@ -10824,6 +11463,7 @@ through2@^0.6.1:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 through2@^2.0.0, through2@^2.0.1, through2@^2.0.3:
@@ -10834,6 +11474,8 @@ through2@^2.0.0, through2@^2.0.1, through2@^2.0.3:
     xtend "~4.0.1"
 
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -10947,6 +11589,7 @@ to-regex@^3.0.1:
     extend-shallow "^2.0.1"
     regex-not "^1.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 touch@3.1.0, touch@^3.1.0:
   version "3.1.0"
@@ -10964,6 +11607,15 @@ touch@1.0.0:
 
 tough-cookie@^2.2.0, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
 >>>>>>> Cleaned PR + tests.
+=======
+touch@3.1.0, touch@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
+  dependencies:
+    nopt "~1.0.10"
+
+tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
+>>>>>>> Undoing yarn stuff.
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
   dependencies:
@@ -11023,11 +11675,15 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 type-detect@^4.0.0, type-detect@^4.0.5:
 =======
 type-detect@^4.0.0:
 >>>>>>> Cleaned PR + tests.
+=======
+type-detect@^4.0.0, type-detect@^4.0.5:
+>>>>>>> Undoing yarn stuff.
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.5.tgz#d70e5bc81db6de2a381bcaca0c6e0cbdc7635de2"
 
@@ -11148,12 +11804,18 @@ underscore@~1.6.0:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 underscore@~1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@@ -11206,15 +11868,19 @@ unset-value@^1.0.0:
 <<<<<<< HEAD
 =======
 
+<<<<<<< HEAD
 unzip-response@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
 >>>>>>> Cleaned PR + tests.
 
+=======
+>>>>>>> Undoing yarn stuff.
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 update-notifier@^2.1.0, update-notifier@^2.3.0:
 =======
@@ -11245,6 +11911,9 @@ update-notifier@^0.7.0:
 
 update-notifier@^2.1.0:
 >>>>>>> Cleaned PR + tests.
+=======
+update-notifier@^2.1.0, update-notifier@^2.3.0:
+>>>>>>> Undoing yarn stuff.
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451"
   dependencies:
@@ -11264,12 +11933,19 @@ upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 >>>>>>> Cleaned PR + tests.
+=======
+<<<<<<< HEAD
+>>>>>>> Undoing yarn stuff.
 urix@^0.1.0, urix@~0.1.0:
 =======
 urix@^0.1.0:
 >>>>>>> Cleaned PR + tests.
+=======
+urix@^0.1.0, urix@~0.1.0:
+>>>>>>> Undoing yarn stuff.
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
@@ -11367,11 +12043,15 @@ vary@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.0.1.tgz#99e4981566a286118dfb2b817357df7993376d10"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 vary@~1.1.2:
 =======
 vary@~1.1.0, vary@~1.1.2:
 >>>>>>> Cleaned PR + tests.
+=======
+vary@~1.1.2:
+>>>>>>> Undoing yarn stuff.
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
 
@@ -11517,11 +12197,15 @@ watchify@3.9.0:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 wd@^1.4.0:
 =======
 wd@^1.0.0:
 >>>>>>> Cleaned PR + tests.
+=======
+wd@^1.4.0:
+>>>>>>> Undoing yarn stuff.
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/wd/-/wd-1.5.0.tgz#45c96a16ff9f8c0f9e7ca90f806a8b48bd0034d6"
   dependencies:
@@ -11584,14 +12268,20 @@ whet.extend@~0.9.9:
   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> Undoing yarn stuff.
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
 which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.14, which@^1.2.9:
+<<<<<<< HEAD
 =======
 which@^1.0.9, which@^1.1.1, which@^1.2.12, which@^1.2.14, which@^1.2.9:
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Undoing yarn stuff.
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -11603,12 +12293,15 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2"
 
+<<<<<<< HEAD
 widest-line@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
   dependencies:
     string-width "^2.1.1"
 
+=======
+>>>>>>> Undoing yarn stuff.
 widest-line@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"

From b1d8bef59c7683bcba48d765a05b7ba844423629 Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Fri, 12 Jan 2018 17:14:06 -0500
Subject: [PATCH 07/20] Yarn attempt #2.

---
 yarn.lock | 1438 +++--------------------------------------------------
 1 file changed, 60 insertions(+), 1378 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 76d3ea0c1de5..3f094f0c1e37 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -144,6 +144,7 @@ JSONStream@^1.0.3:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 abab@^1.0.4:
@@ -162,6 +163,9 @@ abab@^1.0.0:
 abab@^1.0.3:
 >>>>>>> Undoing yarn stuff.
 >>>>>>> Undoing yarn stuff.
+=======
+abab@^1.0.3:
+>>>>>>> Yarn attempt #2.
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
 
@@ -187,15 +191,7 @@ accepts@~1.2.12, accepts@~1.2.13:
     mime-types "~2.1.6"
     negotiator "0.5.3"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-accepts@~1.3.0, accepts@~1.3.4:
-=======
-accepts@~1.3.0, accepts@~1.3.3, accepts@~1.3.4:
->>>>>>> Cleaned PR + tests.
-=======
 accepts@~1.3.0, accepts@~1.3.4:
->>>>>>> Undoing yarn stuff.
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.4.tgz#86246758c7dd6d21a6474ff084a4740ec05eb21f"
   dependencies:
@@ -226,6 +222,7 @@ acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 acorn@^5.0.0, acorn@^5.0.3, acorn@^5.2.1:
@@ -243,10 +240,11 @@ acorn@^5.2.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
 >>>>>>> Cleaned PR + tests.
 =======
+=======
+>>>>>>> Yarn attempt #2.
 acorn@^5.0.0, acorn@^5.0.3, acorn@^5.1.2, acorn@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
->>>>>>> Undoing yarn stuff.
 
 active-x-obfuscator@0.0.1:
   version "0.0.1"
@@ -294,6 +292,7 @@ ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 ajv@6.1.1:
@@ -320,26 +319,24 @@ ajv@5.5.2, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
 >>>>>>> Undoing yarn stuff.
 >>>>>>> Undoing yarn stuff.
+=======
+ajv@5.5.2, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+>>>>>>> Yarn attempt #2.
   dependencies:
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-ajv@^4.9.1:
-=======
-ajv@^4.7.0, ajv@^4.9.1:
->>>>>>> Cleaned PR + tests.
-=======
 ajv@^4.9.1:
->>>>>>> Undoing yarn stuff.
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -361,6 +358,8 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
 >>>>>>> Cleaned PR + tests.
 =======
 >>>>>>> Undoing yarn stuff.
+=======
+>>>>>>> Yarn attempt #2.
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -409,21 +408,12 @@ ansi-gray@^0.1.1:
   dependencies:
     ansi-wrap "0.1.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 ansi-red@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
   dependencies:
     ansi-wrap "0.1.0"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 ansi-regex@^0.2.0, ansi-regex@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
@@ -458,11 +448,10 @@ ansi-styles@~1.0.0:
 ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
 =======
 ansi-wrap@0.1.0:
-<<<<<<< HEAD
-=======
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 any-promise@^0.1.0:
 >>>>>>> Cleaned PR + tests.
@@ -472,6 +461,8 @@ any-promise@^0.1.0:
 
 =======
 >>>>>>> Undoing yarn stuff.
+=======
+>>>>>>> Yarn attempt #2.
 any-shell-escape@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/any-shell-escape/-/any-shell-escape-0.1.1.tgz#d55ab972244c71a9a5e1ab0879f30bf110806959"
@@ -643,10 +634,6 @@ array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 array.prototype.find@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90"
@@ -657,14 +644,6 @@ array.prototype.find@^2.0.4:
 arraybuffer.slice@~0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-<<<<<<< HEAD
-=======
-arraybuffer.slice@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
@@ -708,13 +687,6 @@ assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
 
-<<<<<<< HEAD
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-
-=======
->>>>>>> Undoing yarn stuff.
 ast-replace@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/ast-replace/-/ast-replace-1.1.3.tgz#b9fc248a63fdc67a2656bef6f65d4c1d014d9a8d"
@@ -761,15 +733,7 @@ async@2.0.1:
   dependencies:
     lodash "^4.8.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-async@^2.0.0, async@^2.1.2, async@^2.6.0:
-=======
-async@^2.0.0, async@^2.0.1, async@^2.1.4:
->>>>>>> Cleaned PR + tests.
-=======
 async@^2.0.0, async@^2.1.2, async@^2.6.0:
->>>>>>> Undoing yarn stuff.
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
@@ -1629,19 +1593,7 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-bluebird@3.5.1, bluebird@^3.0.0, bluebird@^3.1.1, bluebird@^3.3.0:
-=======
-bluebird@3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.0.5.tgz#2ff9d07c9b3edb29d6d280fe07528365e7ecd392"
-
-bluebird@^3.0.0, bluebird@^3.3.0:
->>>>>>> Cleaned PR + tests.
-=======
 bluebird@3.5.1, bluebird@^3.0.0, bluebird@^3.1.1, bluebird@^3.3.0:
->>>>>>> Undoing yarn stuff.
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
 
@@ -1649,30 +1601,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-body-parser@1.18.2, body-parser@^1.16.1:
-=======
-body-parser@1.14.2:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.14.2.tgz#1015cb1fe2c443858259581db53332f8d0cf50f9"
-  dependencies:
-    bytes "2.2.0"
-    content-type "~1.0.1"
-    debug "~2.2.0"
-    depd "~1.1.0"
-    http-errors "~1.3.1"
-    iconv-lite "0.4.13"
-    on-finished "~2.3.0"
-    qs "5.2.0"
-    raw-body "~2.1.5"
-    type-is "~1.6.10"
-
-body-parser@^1.16.1:
->>>>>>> Cleaned PR + tests.
-=======
 body-parser@1.18.2, body-parser@^1.16.1:
->>>>>>> Undoing yarn stuff.
   version "1.18.2"
   resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
   dependencies:
@@ -1786,6 +1715,7 @@ braces@^2.3.0:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -1795,10 +1725,13 @@ braces@^2.3.0:
 =======
 >>>>>>> Undoing yarn stuff.
 >>>>>>> Undoing yarn stuff.
+=======
+>>>>>>> Yarn attempt #2.
 brcast@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/brcast/-/brcast-2.0.2.tgz#2db16de44140e418dc37fab10beec0369e78dcef"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
@@ -1808,6 +1741,8 @@ brcast@^2.0.2:
 =======
 >>>>>>> Undoing yarn stuff.
 >>>>>>> Undoing yarn stuff.
+=======
+>>>>>>> Yarn attempt #2.
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -1891,36 +1826,15 @@ browserify-sign@^4.0.0:
     inherits "^2.0.1"
     parse-asn1 "^5.0.0"
 
-<<<<<<< HEAD
-browserify-zlib@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
-  dependencies:
-    pako "~1.0.5"
-
-<<<<<<< HEAD
-browserify@15.0.0:
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/browserify/-/browserify-15.0.0.tgz#37fa47b46846cddd820e084870a66ff6def5164a"
-=======
-=======
->>>>>>> Undoing yarn stuff.
 browserify-zlib@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
   dependencies:
     pako "~1.0.5"
 
-<<<<<<< HEAD
-browserify@14.4.0:
-  version "14.4.0"
-  resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.4.0.tgz#089a3463af58d0e48d8cd4070b3f74654d5abca9"
->>>>>>> Cleaned PR + tests.
-=======
 browserify@15.0.0:
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/browserify/-/browserify-15.0.0.tgz#37fa47b46846cddd820e084870a66ff6def5164a"
->>>>>>> Undoing yarn stuff.
   dependencies:
     JSONStream "^1.0.3"
     assert "^1.4.0"
@@ -1970,16 +1884,7 @@ browserify@15.0.0:
     vm-browserify "~0.0.1"
     xtend "^4.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-browserify@^14.0.0, browserify@^14.5.0:
-  version "14.5.0"
-  resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.5.0.tgz#0bbbce521acd6e4d1d54d8e9365008efb85a9cc5"
-=======
-browserify@^14.0.0:
-=======
 browserify@^14.0.0, browserify@^14.5.0:
->>>>>>> Undoing yarn stuff.
   version "14.5.0"
   resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.5.0.tgz#0bbbce521acd6e4d1d54d8e9365008efb85a9cc5"
   dependencies:
@@ -2031,72 +1936,6 @@ browserify@^14.0.0, browserify@^14.5.0:
     vm-browserify "~0.0.1"
     xtend "^4.0.0"
 
-<<<<<<< HEAD
-browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
->>>>>>> Cleaned PR + tests.
-  dependencies:
-    JSONStream "^1.0.3"
-    assert "^1.4.0"
-    browser-pack "^6.0.1"
-    browser-resolve "^1.11.0"
-    browserify-zlib "~0.2.0"
-    buffer "^5.0.2"
-    cached-path-relative "^1.0.0"
-    concat-stream "~1.5.1"
-    console-browserify "^1.1.0"
-    constants-browserify "~1.0.0"
-    crypto-browserify "^3.0.0"
-    defined "^1.0.0"
-    deps-sort "^2.0.0"
-    domain-browser "~1.1.0"
-    duplexer2 "~0.1.2"
-    events "~1.1.0"
-    glob "^7.1.0"
-    has "^1.0.0"
-    htmlescape "^1.1.0"
-    https-browserify "^1.0.0"
-    inherits "~2.0.1"
-    insert-module-globals "^7.0.0"
-    labeled-stream-splicer "^2.0.0"
-    module-deps "^4.0.8"
-    os-browserify "~0.3.0"
-    parents "^1.0.1"
-    path-browserify "~0.0.0"
-    process "~0.11.0"
-    punycode "^1.3.2"
-    querystring-es3 "~0.2.0"
-    read-only-stream "^2.0.0"
-    readable-stream "^2.0.2"
-    resolve "^1.1.4"
-    shasum "^1.0.0"
-    shell-quote "^1.6.1"
-    stream-browserify "^2.0.0"
-    stream-http "^2.0.0"
-    string_decoder "~1.0.0"
-    subarg "^1.0.0"
-    syntax-error "^1.1.1"
-    through2 "^2.0.0"
-    timers-browserify "^1.0.1"
-    tty-browserify "~0.0.0"
-    url "~0.11.0"
-    util "~0.10.1"
-    vm-browserify "~0.0.1"
-    xtend "^4.0.0"
-
-<<<<<<< HEAD
-browserslist@^2.0.0, browserslist@^2.1.2:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.10.0.tgz#bac5ee1cc69ca9d96403ffb8a3abdc5b6aed6346"
-  dependencies:
-    caniuse-lite "^1.0.30000780"
-    electron-to-chromium "^1.3.28"
-=======
-browserslist@^2.1.2:
-  version "2.11.1"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.1.tgz#02fda29d9a2164b879100126e7b0d0b57e43a7bb"
-=======
 browserslist@^2.0.0, browserslist@^2.1.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.10.0.tgz#bac5ee1cc69ca9d96403ffb8a3abdc5b6aed6346"
@@ -2104,16 +1943,6 @@ browserslist@^2.0.0, browserslist@^2.1.2:
     caniuse-lite "^1.0.30000780"
     electron-to-chromium "^1.3.28"
 
-browserslist@^2.10.2:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.0.tgz#50350d6873a82ebe0f3ae5483658c571ae5f9d7d"
->>>>>>> Undoing yarn stuff.
-  dependencies:
-    caniuse-lite "^1.0.30000784"
-    electron-to-chromium "^1.3.30"
->>>>>>> Cleaned PR + tests.
-
-<<<<<<< HEAD
 browserslist@^2.10.2:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.0.tgz#50350d6873a82ebe0f3ae5483658c571ae5f9d7d"
@@ -2121,8 +1950,6 @@ browserslist@^2.10.2:
     caniuse-lite "^1.0.30000784"
     electron-to-chromium "^1.3.30"
 
-=======
->>>>>>> Undoing yarn stuff.
 buf-compare@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buf-compare/-/buf-compare-1.0.1.tgz#fef28da8b8113a0a0db4430b0b6467b69730b34a"
@@ -2148,21 +1975,9 @@ bufferstreams@1.0.1:
   dependencies:
     readable-stream "^1.0.33"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-buildmail@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
-=======
-bufferstreams@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/bufferstreams/-/bufferstreams-1.1.3.tgz#a8515ac024fa90e8fa7d58c11b13dea1f28abe72"
->>>>>>> Cleaned PR + tests.
-=======
 buildmail@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/buildmail/-/buildmail-4.0.1.tgz#877f7738b78729871c9a105e3b837d2be11a7a72"
->>>>>>> Undoing yarn stuff.
   dependencies:
     addressparser "1.0.1"
     libbase64 "0.1.0"
@@ -2281,25 +2096,6 @@ caniuse-api@^2.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000780:
-  version "1.0.30000784"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000784.tgz#129ced74e9a1280a441880b6cd2bce30ef59e6c0"
-
-caniuse-lite@^1.0.30000784:
-  version "1.0.30000789"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000789.tgz#2e3d937b267133f63635ef7f441fac66360fc889"
-=======
-caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000613, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000791"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000791.tgz#06787f56caef4300a17e35d137447123bdf536f9"
-
-caniuse-lite@^1.0.30000789:
-  version "1.0.30000791"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000791.tgz#8e35745efd483a3e23bb7d350990326d2319fc16"
->>>>>>> Cleaned PR + tests.
-=======
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000780:
   version "1.0.30000784"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000784.tgz#129ced74e9a1280a441880b6cd2bce30ef59e6c0"
@@ -2307,7 +2103,6 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000780:
 caniuse-lite@^1.0.30000784:
   version "1.0.30000789"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000789.tgz#2e3d937b267133f63635ef7f441fac66360fc889"
->>>>>>> Undoing yarn stuff.
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -2371,27 +2166,6 @@ chalk@^0.5.0, chalk@^0.5.1:
     strip-ansi "^0.3.0"
     supports-color "^0.2.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-=======
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
-  dependencies:
-    ansi-styles "^3.1.0"
-    escape-string-regexp "^1.0.5"
-    supports-color "^4.0.0"
->>>>>>> Cleaned PR + tests.
-=======
 chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -2401,7 +2175,6 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     has-ansi "^2.0.0"
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
->>>>>>> Undoing yarn stuff.
 
 chardet@^0.4.0:
   version "0.4.2"
@@ -2475,23 +2248,14 @@ clap@^1.0.9:
     chalk "^1.1.3"
 
 class-utils@^0.3.5:
-<<<<<<< HEAD
-<<<<<<< HEAD
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.5.tgz#17e793103750f9627b2176ea34cfd1b565903c80"
-=======
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
->>>>>>> Cleaned PR + tests.
-=======
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.5.tgz#17e793103750f9627b2176ea34cfd1b565903c80"
->>>>>>> Undoing yarn stuff.
   dependencies:
     arr-union "^3.1.0"
     define-property "^0.2.5"
     isobject "^3.0.0"
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
     lazy-cache "^2.0.2"
     static-extend "^0.1.1"
@@ -2510,6 +2274,8 @@ classnames@^2.2.5:
 >>>>>>> Cleaned PR + tests.
 =======
 =======
+=======
+>>>>>>> Yarn attempt #2.
     lazy-cache "^2.0.2"
     static-extend "^0.1.1"
 
@@ -2517,8 +2283,11 @@ classnames@^2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
 
+<<<<<<< HEAD
 >>>>>>> Undoing yarn stuff.
 >>>>>>> Undoing yarn stuff.
+=======
+>>>>>>> Yarn attempt #2.
 clean-stack@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31"
@@ -2540,23 +2309,10 @@ cli-cursor@^2.1.0:
 cli-spinners@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06"
-<<<<<<< HEAD
-=======
 
-<<<<<<< HEAD
-cli-truncate@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574"
-  dependencies:
-    slice-ansi "0.0.4"
-    string-width "^1.0.1"
->>>>>>> Cleaned PR + tests.
-
-=======
->>>>>>> Undoing yarn stuff.
-cli-truncate@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086"
+cli-truncate@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-1.1.0.tgz#2b2dfd83c53cfd3572b87fc4d430a808afb04086"
   dependencies:
     slice-ansi "^1.0.0"
     string-width "^2.0.0"
@@ -2656,15 +2412,7 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-color-convert@^1.8.2, color-convert@^1.9.0:
-=======
-color-convert@^1.3.0, color-convert@^1.9.0:
->>>>>>> Cleaned PR + tests.
-=======
 color-convert@^1.8.2, color-convert@^1.9.0:
->>>>>>> Undoing yarn stuff.
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
   dependencies:
@@ -2684,21 +2432,7 @@ color-string@^1.4.0:
 color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-<<<<<<< HEAD
-=======
 
-<<<<<<< HEAD
-color@^0.11.0:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
-  dependencies:
-    clone "^1.0.2"
-    color-convert "^1.3.0"
-    color-string "^0.3.0"
->>>>>>> Cleaned PR + tests.
-
-=======
->>>>>>> Undoing yarn stuff.
 color@^1.0.0:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/color/-/color-1.0.3.tgz#e48e832d85f14ef694fb468811c2d5cfe729b55d"
@@ -2739,31 +2473,10 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-commander@2.11.0:
-  version "2.11.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
-=======
-commander@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-0.6.1.tgz#fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06"
-
-commander@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.3.0.tgz#fd430e889832ec353b9acd1de217c11cb3eef873"
-
-commander@^2.9.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
->>>>>>> Cleaned PR + tests.
-
-=======
 commander@2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
->>>>>>> Undoing yarn stuff.
 commander@^2.12.2, commander@^2.9.0, commander@~2.12.1:
   version "2.12.2"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.2.tgz#0f5946c427ed9ec0d91a46bb9def53e54650e555"
@@ -2784,16 +2497,6 @@ component-bind@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-component-emitter@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.1.2.tgz#296594f2753daa63996d2af08d15a95116c9aec3"
-
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 component-emitter@1.2.1, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
@@ -2989,6 +2692,7 @@ content-type@~1.0.1, content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 convert-source-map@1.X, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
@@ -3007,6 +2711,9 @@ convert-source-map@^1.0.0, convert-source-map@^1.1.3, convert-source-map@^1.2.0,
 convert-source-map@1.X, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0:
 >>>>>>> Undoing yarn stuff.
 >>>>>>> Undoing yarn stuff.
+=======
+convert-source-map@1.X, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0:
+>>>>>>> Yarn attempt #2.
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
@@ -3345,28 +3052,6 @@ dateformat@^1.0.6, dateformat@^1.0.7-1.2.3:
     meow "^3.3.0"
 
 dateformat@^2.0.0:
-<<<<<<< HEAD
-=======
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
-
-debug-fabulous@1.X:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/debug-fabulous/-/debug-fabulous-1.0.0.tgz#57f6648646097b1b0849dcda0017362c1ec00f8b"
-  dependencies:
-    debug "3.X"
-    memoizee "0.4.X"
-    object-assign "4.X"
-
-debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@~2.6.4, debug@~2.6.6, debug@~2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
-  dependencies:
-    ms "2.0.0"
-
-<<<<<<< HEAD
-debug@2.2.0, debug@~2.2.0:
->>>>>>> Cleaned PR + tests.
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
 
@@ -3384,8 +3069,6 @@ debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@~2.6.4, de
   dependencies:
     ms "2.0.0"
 
-=======
->>>>>>> Undoing yarn stuff.
 debug@3.1.0, debug@3.X, debug@^3.0.1, debug@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -3457,21 +3140,6 @@ define-property@^1.0.0:
   dependencies:
     is-descriptor "^1.0.0"
 
-<<<<<<< HEAD
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  dependencies:
-    is-descriptor "^1.0.0"
-
-=======
->>>>>>> Cleaned PR + tests.
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -3571,10 +3239,6 @@ detect-file@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
 
-detect-file@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
-
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
@@ -3589,31 +3253,10 @@ detect-libc@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 detect-newline@2.X:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
 
-<<<<<<< HEAD
-detective@^4.0.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.0.tgz#6276e150f9e50829ad1f90ace4d9a2304188afcf"
-  dependencies:
-    acorn "^5.2.1"
-    defined "^1.0.0"
-
-detective@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-5.0.2.tgz#84ec2e1c581e74211e2ae4ffce1edf52c3263f84"
-  dependencies:
-    "@browserify/acorn5-object-spread" "^5.0.1"
-    acorn "^5.2.1"
-=======
-=======
->>>>>>> Undoing yarn stuff.
 detective@^4.0.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.0.tgz#6276e150f9e50829ad1f90ace4d9a2304188afcf"
@@ -3627,36 +3270,15 @@ detective@^5.0.2:
   dependencies:
     "@browserify/acorn5-object-spread" "^5.0.1"
     acorn "^5.2.1"
->>>>>>> Cleaned PR + tests.
     defined "^1.0.0"
 
 di@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-diff@3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
-=======
-diff-match-patch@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/diff-match-patch/-/diff-match-patch-1.0.0.tgz#1cc3c83a490d67f95d91e39f6ad1f2e086b63048"
-
-diff@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"
-=======
 diff@3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.3.1.tgz#aa8567a6eed03c531fc89d3f711cd0e5259dec75"
->>>>>>> Undoing yarn stuff.
-
-diff@^3.1.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.4.0.tgz#b1d85507daf3964828de54b37d0d73ba67dda56c"
->>>>>>> Cleaned PR + tests.
 
 diff@^3.1.0:
   version "3.4.0"
@@ -3670,12 +3292,15 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 doctrine@2.1.0, doctrine@^2.1.0:
 =======
 =======
 >>>>>>> Undoing yarn stuff.
+=======
+>>>>>>> Yarn attempt #2.
 <<<<<<< HEAD
 direction@^1.0.1:
   version "1.0.1"
@@ -3687,6 +3312,7 @@ direction@^1.0.1:
 =======
 <<<<<<< HEAD
 >>>>>>> Undoing yarn stuff.
+<<<<<<< HEAD
 doctrine@2.1.0:
 >>>>>>> Cleaned PR + tests.
   version "2.1.0"
@@ -3700,11 +3326,12 @@ doctrine@^2.0.2:
 =======
 doctrine@^2.0.0:
 =======
+>>>>>>> Yarn attempt #2.
+=======
+>>>>>>> Yarn attempt #2.
 doctrine@2.1.0:
->>>>>>> Undoing yarn stuff.
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
->>>>>>> Cleaned PR + tests.
   dependencies:
     esutils "^2.0.2"
 
@@ -3765,21 +3392,9 @@ duplexer@^0.1.1, duplexer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 duplexify@^3.5.0:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd"
-=======
-duplexify@^3.2.0, duplexify@^3.5.0:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.3.tgz#8b5818800df92fd0125b27ab896491912858243e"
->>>>>>> Cleaned PR + tests.
-=======
-duplexify@^3.5.0:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.1.tgz#4e1516be68838bc90a49994f0b39a6e5960befcd"
->>>>>>> Undoing yarn stuff.
   dependencies:
     end-of-stream "^1.0.0"
     inherits "^2.0.1"
@@ -3812,15 +3427,7 @@ electron-releases@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/electron-releases/-/electron-releases-2.1.0.tgz#c5614bf811f176ce3c836e368a0625782341fd4e"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-electron-to-chromium@^1.3.28, electron-to-chromium@^1.3.30:
-=======
-electron-to-chromium@^1.2.0, electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
->>>>>>> Cleaned PR + tests.
-=======
 electron-to-chromium@^1.3.28, electron-to-chromium@^1.3.30:
->>>>>>> Undoing yarn stuff.
   version "1.3.30"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.30.tgz#9666f532a64586651fc56a72513692e820d06a80"
   dependencies:
@@ -3934,10 +3541,6 @@ errorhandler@~1.4.2:
     accepts "~1.3.0"
     escape-html "~1.0.3"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 es-abstract@^1.6.1, es-abstract@^1.7.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
@@ -3957,12 +3560,6 @@ es-to-primitive@^1.1.1:
     is-symbol "^1.0.1"
 
 es5-ext@^0.10.14, es5-ext@^0.10.30, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14, es5-ext@~0.10.2:
-<<<<<<< HEAD
-=======
-es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
   version "0.10.37"
   resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.37.tgz#0ee741d148b80069ba27d020393756af257defc3"
   dependencies:
@@ -4235,15 +3832,7 @@ espower-location-detector@^1.0.0:
     source-map "^0.5.0"
     xtend "^4.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-espree@^3.5.2:
-=======
-espree@^3.4.0, espree@^3.5.2:
->>>>>>> Cleaned PR + tests.
-=======
 espree@^3.5.2:
->>>>>>> Undoing yarn stuff.
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca"
   dependencies:
@@ -4513,32 +4102,8 @@ extglob@^0.3.1:
     is-extglob "^1.0.0"
 
 extglob@^2.0.2:
-<<<<<<< HEAD
-<<<<<<< HEAD
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.2.tgz#3290f46208db1b2e8eb8be0c94ed9e6ad80edbe2"
-=======
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.3.tgz#55e019d0c95bf873949c737b7e5172dba84ebb29"
-=======
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.2.tgz#3290f46208db1b2e8eb8be0c94ed9e6ad80edbe2"
->>>>>>> Undoing yarn stuff.
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-<<<<<<< HEAD
-extract-zip@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.5.0.tgz#92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"
->>>>>>> Cleaned PR + tests.
   dependencies:
     array-unique "^0.3.2"
     define-property "^1.0.0"
@@ -4549,8 +4114,6 @@ extract-zip@~1.5.0:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-=======
->>>>>>> Undoing yarn stuff.
 extsprintf@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -4559,6 +4122,7 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 fancy-log@1.3.2, fancy-log@^1.1.0, fancy-log@^1.2.0, fancy-log@^1.3.2:
@@ -4577,6 +4141,9 @@ fancy-log@^1.1.0:
 fancy-log@^1.1.0, fancy-log@^1.2.0, fancy-log@^1.3.2:
 >>>>>>> Undoing yarn stuff.
 >>>>>>> Undoing yarn stuff.
+=======
+fancy-log@^1.1.0, fancy-log@^1.2.0, fancy-log@^1.3.2:
+>>>>>>> Yarn attempt #2.
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
   dependencies:
@@ -4665,17 +4232,7 @@ fill-range@^4.0.0:
     is-number "^3.0.0"
     repeat-string "^1.6.1"
     to-regex-range "^2.1.0"
-<<<<<<< HEAD
-=======
-
-<<<<<<< HEAD
-filled-array@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/filled-array/-/filled-array-1.1.0.tgz#c3c4f6c663b923459a9aa29912d2d031f1507f84"
->>>>>>> Cleaned PR + tests.
 
-=======
->>>>>>> Undoing yarn stuff.
 finalhandler@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-0.4.0.tgz#965a52d9e8d05d2b857548541fb89b53a2497d9b"
@@ -4697,21 +4254,9 @@ finalhandler@1.0.6:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-finalhandler@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
-=======
-finalhandler@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.6.tgz#007aea33d1a4d3e42017f624848ad58d212f814f"
->>>>>>> Cleaned PR + tests.
-=======
 finalhandler@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
->>>>>>> Undoing yarn stuff.
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -4754,36 +4299,15 @@ find-up@^2.0.0, find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-findup-sync@^0.4.0:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
-=======
-findup-sync@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.2.1.tgz#e0a90a450075c49466ee513732057514b81e878c"
-=======
 findup-sync@^0.4.0:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
->>>>>>> Undoing yarn stuff.
   dependencies:
     detect-file "^0.1.0"
     is-glob "^2.0.1"
     micromatch "^2.3.7"
     resolve-dir "^0.1.0"
 
-findup-sync@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
->>>>>>> Cleaned PR + tests.
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^3.1.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
 findup-sync@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
@@ -4834,21 +4358,12 @@ fn-name@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fn-name/-/fn-name-2.0.1.tgz#5214d7537a4d06a4a301c0cc262feb84188002e7"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 follow-redirects@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.0.0.tgz#8e34298cbd2e176f254effec75a1c78cc849fd37"
   dependencies:
     debug "^2.2.0"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
@@ -4985,10 +4500,6 @@ fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
     mkdirp ">=0.5 0"
     rimraf "2"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 ftp@~0.3.10:
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/ftp/-/ftp-0.3.10.tgz#9197d861ad8142f3e63d5a83bfe4c59f7330885d"
@@ -4997,12 +4508,6 @@ ftp@~0.3.10:
     xregexp "2.0.0"
 
 function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
-<<<<<<< HEAD
-=======
-function-bind@^1.0.2:
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
@@ -5075,10 +4580,6 @@ get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 get-uri@2:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.1.tgz#dbdcacacd8c608a38316869368117697a1631c59"
@@ -5090,11 +4591,6 @@ get-uri@2:
     ftp "~0.3.10"
     readable-stream "2"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
@@ -5152,19 +4648,6 @@ glob2base@^0.0.12:
   dependencies:
     find-index "^0.1.1"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-glob@3.2.11:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
-  dependencies:
-    inherits "2"
-    minimatch "0.3"
-
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 glob@7.1.2, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1, glob@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -5209,15 +4692,6 @@ global-cache@^1.2.1:
   dependencies:
     define-properties "^1.1.2"
     is-symbol "^1.0.1"
-<<<<<<< HEAD
-
-global-dirs@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
-  dependencies:
-    ini "^1.3.4"
-=======
->>>>>>> Undoing yarn stuff.
 
 global-dirs@^0.1.0:
   version "0.1.1"
@@ -5259,10 +4733,6 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 globals@^10.0.0:
   version "10.4.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-10.4.0.tgz#5c477388b128a9e4c5c5d01c7a2aca68c68b2da7"
@@ -5272,12 +4742,6 @@ globals@^11.0.1:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.1.0.tgz#632644457f5f0e3ae711807183700ebf2e4633e4"
 
 globals@^9.18.0:
-<<<<<<< HEAD
-=======
-globals@^9.14.0, globals@^9.17.0, globals@^9.18.0:
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
   version "9.18.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
 
@@ -5706,40 +5170,6 @@ has-unicode@^2.0.0:
 has-value@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-<<<<<<< HEAD
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-has-yarn@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-1.0.0.tgz#89e25db604b725c8f5976fff0addc921b828a5a7"
-
-has@^1.0.0, has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
-=======
->>>>>>> Cleaned PR + tests.
   dependencies:
     get-value "^2.0.3"
     has-values "^0.1.4"
@@ -5909,17 +5339,6 @@ http-errors@~1.3.1:
 http-parser-js@>=0.4.0:
   version "0.4.9"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.9.tgz#ea1a04fb64adff0242e9974f297dd4c3cad271e1"
-<<<<<<< HEAD
-
-http-proxy-agent@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz#cc1ce38e453bf984a0f7702d2dd59c73d081284a"
-  dependencies:
-    agent-base "2"
-    debug "2"
-    extend "3"
-=======
->>>>>>> Cleaned PR + tests.
 
 http-proxy-agent@1:
   version "1.0.0"
@@ -6039,15 +5458,7 @@ ignore-by-default@^1.0.0, ignore-by-default@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-ignore@^3.3.3:
-=======
-ignore@^3.2.0, ignore@^3.3.3:
->>>>>>> Cleaned PR + tests.
-=======
 ignore@^3.3.3:
->>>>>>> Undoing yarn stuff.
   version "3.3.7"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
 
@@ -6212,19 +5623,7 @@ is-accessor-descriptor@^0.1.6:
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
   dependencies:
     kind-of "^3.0.2"
-<<<<<<< HEAD
-=======
-
-<<<<<<< HEAD
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  dependencies:
-    kind-of "^6.0.0"
->>>>>>> Cleaned PR + tests.
 
-=======
->>>>>>> Undoing yarn stuff.
 is-arrayish@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
@@ -6259,10 +5658,6 @@ is-ci@^1.0.7:
   dependencies:
     ci-info "^1.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 is-color-stop@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
@@ -6274,51 +5669,15 @@ is-color-stop@^1.1.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
   dependencies:
     kind-of "^3.0.2"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-is-date-object@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
-=======
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  dependencies:
-    kind-of "^6.0.0"
-=======
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
->>>>>>> Undoing yarn stuff.
-
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.1.tgz#2c6023599bde2de9d5d2c8b9a9d94082036b6ef2"
-  dependencies:
-<<<<<<< HEAD
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
->>>>>>> Cleaned PR + tests.
 
 is-descriptor@^0.1.0:
   version "0.1.6"
@@ -6332,8 +5691,6 @@ is-descriptor@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.1.tgz#2c6023599bde2de9d5d2c8b9a9d94082036b6ef2"
   dependencies:
-=======
->>>>>>> Undoing yarn stuff.
     is-accessor-descriptor "^0.1.6"
     is-data-descriptor "^0.1.4"
     kind-of "^5.0.0"
@@ -6390,19 +5747,10 @@ is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 is-function@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 is-generator-fn@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
@@ -6432,15 +5780,7 @@ is-installed-globally@^0.1.0:
     global-dirs "^0.1.0"
     is-path-inside "^1.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-is-my-json-valid@^2.12.4:
-=======
-is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
->>>>>>> Cleaned PR + tests.
-=======
 is-my-json-valid@^2.12.4:
->>>>>>> Undoing yarn stuff.
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471"
   dependencies:
@@ -6479,21 +5819,12 @@ is-observable@^0.2.0:
   dependencies:
     symbol-observable "^0.2.2"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 is-observable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e"
   dependencies:
     symbol-observable "^1.1.0"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 is-odd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-1.0.0.tgz#3b8a932eb028b3775c39bb09e91767accdb69088"
@@ -6586,10 +5917,6 @@ is-svg@^2.0.0:
   dependencies:
     html-comment-regex "^1.1.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 is-symbol@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
@@ -6598,11 +5925,6 @@ is-touch-device@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-touch-device/-/is-touch-device-1.0.1.tgz#9a2fd59f689e9a9bf6ae9a86924c4ba805a42eab"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -6742,16 +6064,6 @@ jison@0.4.18:
     lex-parser "~0.1.3"
     nomnom "1.5.2"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-js-base64@^2.1.9:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
-
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 js-string-escape@^1.0.0, js-string-escape@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
@@ -7069,29 +6381,10 @@ kind-of@^5.0.0, kind-of@^5.0.2:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-kind-of@^6.0.0:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-=======
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-
-klaw@^1.0.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
-  optionalDependencies:
-    graceful-fs "^4.1.9"
->>>>>>> Cleaned PR + tests.
-
-=======
 kind-of@^6.0.0:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
 
->>>>>>> Undoing yarn stuff.
 labeled-stream-splicer@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz#a52e1d138024c00b86b1c0c91f677918b8ae0a59"
@@ -7190,15 +6483,7 @@ liftoff@^2.1.0:
     rechoir "^0.6.2"
     resolve "^1.1.7"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-link-check@^4.3.3:
-=======
-link-check@^4.0.2:
->>>>>>> Cleaned PR + tests.
-=======
 link-check@^4.3.3:
->>>>>>> Undoing yarn stuff.
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/link-check/-/link-check-4.3.3.tgz#c132453e89f6d9cbb36a114e6c28f3e16e42cf34"
   dependencies:
@@ -7632,15 +6917,6 @@ make-iterator@^1.0.0:
   dependencies:
     kind-of "^3.1.0"
 
-<<<<<<< HEAD
-make-iterator@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.0.tgz#57bef5dc85d23923ba23767324d8e8f8f3d9694b"
-  dependencies:
-    kind-of "^3.1.0"
-
-=======
->>>>>>> Cleaned PR + tests.
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -7660,16 +6936,6 @@ map-stream@~0.1.0:
 map-visit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-<<<<<<< HEAD
-=======
-  dependencies:
-    object-visit "^1.0.0"
-
-<<<<<<< HEAD
-markdown-link-check@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/markdown-link-check/-/markdown-link-check-3.0.3.tgz#6e2357e822d1254deebfa44e83a1881be86889e2"
->>>>>>> Cleaned PR + tests.
   dependencies:
     object-visit "^1.0.0"
 
@@ -7677,12 +6943,6 @@ markdown-link-check@3.1.6:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/markdown-link-check/-/markdown-link-check-3.1.6.tgz#436cba78a1690871bb1afa4ec8f8245b0714dca9"
   dependencies:
-=======
-markdown-link-check@3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/markdown-link-check/-/markdown-link-check-3.1.6.tgz#436cba78a1690871bb1afa4ec8f8245b0714dca9"
-  dependencies:
->>>>>>> Undoing yarn stuff.
     async "^2.6.0"
     chalk "^2.3.0"
     commander "^2.12.2"
@@ -7692,15 +6952,7 @@ markdown-link-check@3.1.6:
     progress "^2.0.0"
     request "^2.83.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 markdown-link-extractor@^1.1.1:
-=======
-markdown-link-extractor@^1.1.0:
->>>>>>> Cleaned PR + tests.
-=======
-markdown-link-extractor@^1.1.1:
->>>>>>> Undoing yarn stuff.
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/markdown-link-extractor/-/markdown-link-extractor-1.1.1.tgz#30802e25c8fa292fedeb7b2b0286c8d980926e71"
   dependencies:
@@ -7800,15 +7052,7 @@ methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-micromatch@^2.1.5, micromatch@^2.3.7, micromatch@^2.3.8:
-=======
-micromatch@^2.1.5:
->>>>>>> Cleaned PR + tests.
-=======
 micromatch@^2.1.5, micromatch@^2.3.7, micromatch@^2.3.8:
->>>>>>> Undoing yarn stuff.
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
@@ -7827,36 +7071,8 @@ micromatch@^2.1.5, micromatch@^2.3.7, micromatch@^2.3.8:
     regex-cache "^0.4.2"
 
 micromatch@^3.0.4:
-<<<<<<< HEAD
-<<<<<<< HEAD
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.4.tgz#bb812e741a41f982c854e42b421a7eac458796f4"
-=======
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.5.tgz#d05e168c206472dfbca985bfef4f57797b4cd4ba"
-=======
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.4.tgz#bb812e741a41f982c854e42b421a7eac458796f4"
->>>>>>> Undoing yarn stuff.
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.0"
-    define-property "^1.0.0"
-    extend-shallow "^2.0.1"
-    extglob "^2.0.2"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.0"
-    nanomatch "^1.2.5"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-miller-rabin@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
->>>>>>> Cleaned PR + tests.
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -7983,27 +7199,10 @@ minimist@~0.0.1:
 mixin-deep@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.0.tgz#47a8732ba97799457c8c1eca28f95132d7e8150a"
-<<<<<<< HEAD
-=======
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
-<<<<<<< HEAD
-mkdirp@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
-
-mkdirp@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12"
->>>>>>> Cleaned PR + tests.
   dependencies:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-=======
->>>>>>> Undoing yarn stuff.
 mkdirp@0.5.1, mkdirp@0.5.x, mkdirp@0.x.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -8045,10 +7244,6 @@ module-deps@^4.0.8:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 module-deps@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-5.0.1.tgz#3bc47c14b0a6d925aff2ec4a177b456a96ae0396"
@@ -8070,12 +7265,6 @@ module-deps@^5.0.0:
     xtend "^4.0.0"
 
 moment@2.20.1, moment@>=1.6.0, moment@^2.18.1:
-<<<<<<< HEAD
-=======
-moment@^2.18.1:
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
   version "2.20.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
 
@@ -8118,21 +7307,7 @@ ms@^1.0.0:
 ms@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-<<<<<<< HEAD
-=======
-
-<<<<<<< HEAD
-multimatch@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.0.0.tgz#c5ada425357b744ba54842ebdce1c8f0be542b6f"
-  dependencies:
-    array-differ "^1.0.0"
-    array-union "^1.0.1"
-    minimatch "^2.0.1"
->>>>>>> Cleaned PR + tests.
 
-=======
->>>>>>> Undoing yarn stuff.
 multimatch@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
@@ -8168,18 +7343,8 @@ nan@~1.0.0:
   resolved "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz#ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"
 
 nanomatch@^1.2.5:
-<<<<<<< HEAD
-<<<<<<< HEAD
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.6.tgz#f27233e97c34a8706b7e781a4bc611c957a81625"
-=======
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.7.tgz#53cd4aa109ff68b7f869591fdc9d10daeeea3e79"
->>>>>>> Cleaned PR + tests.
-=======
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.6.tgz#f27233e97c34a8706b7e781a4bc611c957a81625"
->>>>>>> Undoing yarn stuff.
   dependencies:
     arr-diff "^4.0.0"
     array-unique "^0.3.2"
@@ -8192,17 +7357,7 @@ nanomatch@^1.2.5:
     regex-not "^1.0.0"
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
-<<<<<<< HEAD
-=======
 
-<<<<<<< HEAD
-native-promise-only@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/native-promise-only/-/native-promise-only-0.8.1.tgz#20a318c30cb45f71fe7adfbf7b21c99c1472ef11"
->>>>>>> Cleaned PR + tests.
-
-=======
->>>>>>> Undoing yarn stuff.
 natives@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.1.tgz#011acce1f7cbd87f7ba6b3093d6cd9392be1c574"
@@ -8425,15 +7580,7 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 nwmatcher@^1.4.3:
-=======
-"nwmatcher@>= 1.3.7 < 2.0.0":
->>>>>>> Cleaned PR + tests.
-=======
-nwmatcher@^1.4.3:
->>>>>>> Undoing yarn stuff.
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
 
@@ -8461,12 +7608,15 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 object-keys@^1.0.10, object-keys@^1.0.8:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Yarn attempt #2.
 
 object-keys@^1.0.10, object-keys@^1.0.8:
   version "1.0.11"
@@ -8482,10 +7632,6 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 object.assign@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
@@ -8494,11 +7640,14 @@ object.assign@^4.0.4:
     function-bind "^1.1.0"
     object-keys "^1.0.10"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
 =======
 >>>>>>> Undoing yarn stuff.
+=======
+>>>>>>> Yarn attempt #2.
 <<<<<<< HEAD
 object.assign@^4.1.0:
   version "4.1.0"
@@ -8521,6 +7670,8 @@ object.assign@^4.1.0:
 =======
 >>>>>>> Undoing yarn stuff.
 >>>>>>> Undoing yarn stuff.
+=======
+>>>>>>> Yarn attempt #2.
 object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
@@ -8530,10 +7681,6 @@ object.defaults@^1.1.0:
     for-own "^1.0.0"
     isobject "^3.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 object.entries@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
@@ -8543,25 +7690,11 @@ object.entries@^1.0.4:
     function-bind "^1.1.0"
     has "^1.0.1"
 
-<<<<<<< HEAD
 object.map@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.0.tgz#92aef871cd6dcbced31fe29c0921db8395624597"
   dependencies:
     for-own "^0.1.4"
-=======
-=======
->>>>>>> Undoing yarn stuff.
-object.map@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.0.tgz#92aef871cd6dcbced31fe29c0921db8395624597"
-  dependencies:
-<<<<<<< HEAD
-    for-own "^1.0.0"
->>>>>>> Cleaned PR + tests.
-=======
-    for-own "^0.1.4"
->>>>>>> Undoing yarn stuff.
     make-iterator "^1.0.0"
 
 object.omit@^2.0.0:
@@ -8675,13 +7808,6 @@ ordered-read-streams@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
 
-<<<<<<< HEAD
-os-browserify@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
-
-=======
->>>>>>> Undoing yarn stuff.
 os-browserify@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
@@ -8731,45 +7857,6 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-p-map@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
-
-pac-proxy-agent@1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz#34a385dfdf61d2f0ecace08858c745d3e791fd4d"
-  dependencies:
-    agent-base "2"
-    debug "2"
-    extend "3"
-    get-uri "2"
-    http-proxy-agent "1"
-    https-proxy-agent "1"
-    pac-resolver "~2.0.0"
-    raw-body "2"
-    socks-proxy-agent "2"
-
-pac-resolver@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pac-resolver/-/pac-resolver-2.0.0.tgz#99b88d2f193fbdeefc1c9a529c1f3260ab5277cd"
-  dependencies:
-    co "~3.0.6"
-    degenerator "~1.0.2"
-    ip "1.0.1"
-    netmask "~1.0.4"
-    thunkify "~2.1.1"
-
-package-hash@^1.2.0:
-=======
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-
-package-hash@^1.1.0, package-hash@^1.2.0:
->>>>>>> Cleaned PR + tests.
-=======
 p-map@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
@@ -8799,7 +7886,6 @@ pac-resolver@~2.0.0:
     thunkify "~2.1.1"
 
 package-hash@^1.2.0:
->>>>>>> Undoing yarn stuff.
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/package-hash/-/package-hash-1.2.0.tgz#003e56cd57b736a6ed6114cc2b81542672770e44"
   dependencies:
@@ -8823,13 +7909,6 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
-<<<<<<< HEAD
-pako@~1.0.5:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
-
-=======
->>>>>>> Undoing yarn stuff.
 pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
@@ -9018,13 +8097,6 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-<<<<<<< HEAD
-performance-now@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
-
-=======
->>>>>>> Undoing yarn stuff.
 performance-now@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
@@ -9119,21 +8191,7 @@ policyfile@0.0.4:
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-<<<<<<< HEAD
-=======
 
-<<<<<<< HEAD
-postcss-calc@^5.0.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
-  dependencies:
-    postcss "^5.0.2"
-    postcss-message-helpers "^2.0.0"
-    reduce-css-calc "^1.2.6"
->>>>>>> Cleaned PR + tests.
-
-=======
->>>>>>> Undoing yarn stuff.
 postcss-calc@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-6.0.1.tgz#3d24171bbf6e7629d422a436ebfe6dd9511f4330"
@@ -9397,21 +8455,9 @@ postcss@^6.0.0, postcss@^6.0.1:
     source-map "^0.6.1"
     supports-color "^4.4.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-postcss@^6.0.15:
-  version "6.0.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146"
-=======
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.8, postcss@^5.2.11, postcss@^5.2.16:
-  version "5.2.18"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
->>>>>>> Cleaned PR + tests.
-=======
 postcss@^6.0.15:
   version "6.0.16"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.16.tgz#112e2fe2a6d2109be0957687243170ea5589e146"
->>>>>>> Undoing yarn stuff.
   dependencies:
     chalk "^2.3.0"
     source-map "^0.6.1"
@@ -9509,7 +8555,6 @@ promise-pjs@1.1.3:
 promise@^7.1.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
-<<<<<<< HEAD
   dependencies:
     asap "~2.0.3"
 
@@ -9532,30 +8577,6 @@ proxy-addr@~2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
   dependencies:
-=======
-  dependencies:
-    asap "~2.0.3"
-
-prop-types-exact@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/prop-types-exact/-/prop-types-exact-1.1.1.tgz#c2620207e4f77f9762fa1835b0387a464bd08978"
-  dependencies:
-    has "^1.0.1"
-    object.assign "^4.0.4"
-
-prop-types@15.6.0, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0:
-  version "15.6.0"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
-  dependencies:
-    fbjs "^0.8.16"
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
-
-proxy-addr@~2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.2.tgz#6571504f47bb988ec8180253f85dd7e14952bdec"
-  dependencies:
->>>>>>> Undoing yarn stuff.
     forwarded "~0.1.2"
     ipaddr.js "1.5.2"
 
@@ -9618,15 +8639,7 @@ q@1.4.1, q@~1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-q@^1.1.2, q@^1.4.1, q@^1.5.0:
-=======
-q@^1.1.2, q@^1.4.1:
->>>>>>> Cleaned PR + tests.
-=======
 q@^1.1.2, q@^1.4.1, q@^1.5.0:
->>>>>>> Undoing yarn stuff.
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
 
@@ -9689,28 +8702,11 @@ randomatic@^1.1.3:
     kind-of "^4.0.0"
 
 randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
-<<<<<<< HEAD
-<<<<<<< HEAD
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
-=======
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
-=======
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79"
->>>>>>> Undoing yarn stuff.
   dependencies:
     safe-buffer "^5.1.0"
 
-randomfill@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62"
->>>>>>> Cleaned PR + tests.
-  dependencies:
-    randombytes "^2.0.5"
-    safe-buffer "^5.1.0"
-
 randomfill@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.3.tgz#b96b7df587f01dd91726c418f30553b1418e3d62"
@@ -9751,18 +8747,8 @@ raw-body@~2.1.2:
     unpipe "1.0.0"
 
 rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
-<<<<<<< HEAD
-<<<<<<< HEAD
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
-=======
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.3.tgz#51575a900f8dd68381c710b4712c2154c3e2035b"
->>>>>>> Cleaned PR + tests.
-=======
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.2.tgz#d8ce9cb57e8d64d9c7badd9876c7c34cbe3c7077"
->>>>>>> Undoing yarn stuff.
   dependencies:
     deep-extend "~0.4.0"
     ini "~1.3.0"
@@ -10163,15 +9149,7 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-request@2.83.0, request@^2.0.0, request@^2.74.0, request@^2.83.0:
-=======
-request@^2.55.0, request@^2.79.0, request@^2.83.0:
->>>>>>> Cleaned PR + tests.
-=======
 request@2.83.0, request@^2.0.0, request@^2.74.0, request@^2.83.0:
->>>>>>> Undoing yarn stuff.
   version "2.83.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
   dependencies:
@@ -10276,15 +9254,7 @@ resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 resolve-url@^0.2.1, resolve-url@~0.2.1:
-=======
-resolve-url@^0.2.1:
->>>>>>> Cleaned PR + tests.
-=======
-resolve-url@^0.2.1, resolve-url@~0.2.1:
->>>>>>> Undoing yarn stuff.
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
 
@@ -10312,10 +9282,6 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 rgb-regex@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
@@ -10324,11 +9290,6 @@ rgba-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -10378,15 +9339,7 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-samsam@1.x:
-=======
-samsam@1.x, samsam@^1.1.3:
->>>>>>> Cleaned PR + tests.
-=======
 samsam@1.x:
->>>>>>> Undoing yarn stuff.
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
 
@@ -10445,34 +9398,10 @@ send@0.13.2:
     range-parser "~1.0.3"
     statuses "~1.2.1"
 
-<<<<<<< HEAD
 send@0.16.1:
   version "0.16.1"
   resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
   dependencies:
-<<<<<<< HEAD
-=======
-    debug "~2.2.0"
-    depd "~1.1.0"
-    destroy "~1.0.4"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    etag "~1.7.0"
-    fresh "0.3.0"
-    http-errors "~1.5.1"
-    mime "1.3.4"
-    ms "0.7.2"
-    on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.3.1"
-
-=======
->>>>>>> Undoing yarn stuff.
-send@0.16.1:
-  version "0.16.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3"
-  dependencies:
->>>>>>> Cleaned PR + tests.
     debug "2.6.9"
     depd "~1.1.1"
     destroy "~1.0.4"
@@ -10528,15 +9457,7 @@ serve-index@~1.7.2:
     mime-types "~2.1.9"
     parseurl "~1.3.1"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 serve-static@1.13.1, serve-static@^1.3.0:
-=======
-serve-static@^1.3.0:
->>>>>>> Cleaned PR + tests.
-=======
-serve-static@1.13.1, serve-static@^1.3.0:
->>>>>>> Undoing yarn stuff.
   version "1.13.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719"
   dependencies:
@@ -10585,21 +9506,9 @@ set-value@^2.0.0:
     is-plain-object "^2.0.3"
     split-string "^3.0.1"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-setimmediate@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-=======
-setprototypeof@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.2.tgz#81a552141ec104b88e89ce383103ad5c66564d08"
->>>>>>> Cleaned PR + tests.
-=======
 setimmediate@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
->>>>>>> Undoing yarn stuff.
 
 setprototypeof@1.0.3:
   version "1.0.3"
@@ -10692,10 +9601,6 @@ slide@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 smart-buffer@^1.0.13, smart-buffer@^1.0.4:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
@@ -10707,11 +9612,6 @@ smtp-connection@2.12.0:
     httpntlm "1.6.1"
     nodemailer-shared "1.1.0"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -10822,7 +9722,6 @@ socks-proxy-agent@2:
 socks@1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.9.tgz#628d7e4d04912435445ac0b6e459376cb3e6d691"
-<<<<<<< HEAD
   dependencies:
     ip "^1.1.2"
     smart-buffer "^1.0.4"
@@ -10834,19 +9733,6 @@ socks@~1.1.5:
     ip "^1.1.4"
     smart-buffer "^1.0.13"
 
-=======
-  dependencies:
-    ip "^1.1.2"
-    smart-buffer "^1.0.4"
-
-socks@~1.1.5:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-1.1.10.tgz#5b8b7fc7c8f341c53ed056e929b7bf4de8ba7b5a"
-  dependencies:
-    ip "^1.1.4"
-    smart-buffer "^1.0.13"
-
->>>>>>> Undoing yarn stuff.
 sort-keys@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
@@ -10859,10 +9745,6 @@ sort-keys@^2.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 source-map-resolve@^0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.3.1.tgz#610f6122a445b8dd51535a2a71b783dfc1248761"
@@ -10872,11 +9754,6 @@ source-map-resolve@^0.3.0:
     source-map-url "~0.3.0"
     urix "~0.1.0"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 source-map-resolve@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a"
@@ -10893,29 +9770,16 @@ source-map-support@^0.4.0, source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 source-map-support@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.0.tgz#2018a7ad2bdf8faf2691e5fddab26bed5a2bacab"
   dependencies:
     source-map "^0.6.0"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 source-map-url@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9"
@@ -10930,11 +9794,6 @@ source-map@^0.1.38, source-map@~0.1.33:
   dependencies:
     amdefine ">=0.0.4"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 source-map@^0.4.2, source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
@@ -11013,19 +9872,10 @@ stack-utils@^1.0.0, stack-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 standalone-react-addons-pure-render-mixin@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/standalone-react-addons-pure-render-mixin/-/standalone-react-addons-pure-render-mixin-0.1.1.tgz#3c7409f4c79c40de9ac72c616cf679a994f37551"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 static-extend@^0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -11041,23 +9891,6 @@ statuses@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.2.1.tgz#dded45cc18256d51ed40aec142489d5c61026d28"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-statuses@~1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-
-stealthy-require@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
-
-=======
-statuses@~1.3.0, statuses@~1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-
->>>>>>> Cleaned PR + tests.
-=======
 statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
@@ -11066,7 +9899,6 @@ stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
 
->>>>>>> Undoing yarn stuff.
 stream-browserify@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -11292,25 +10124,9 @@ supports-color@^3.1.0, supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-supports-color@^4.0.0, supports-color@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
-  dependencies:
-    has-flag "^2.0.0"
-
-supports-color@^5.0.0, supports-color@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.1.0.tgz#058a021d1b619f7ddf3980d712ea3590ce7de3d5"
-=======
-supports-color@^4.0.0:
-=======
 supports-color@^4.0.0, supports-color@^4.4.0:
->>>>>>> Undoing yarn stuff.
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
->>>>>>> Cleaned PR + tests.
   dependencies:
     has-flag "^2.0.0"
 
@@ -11336,15 +10152,7 @@ symbol-observable@^0.2.2:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-symbol-observable@^1.0.4, symbol-observable@^1.1.0:
-=======
-symbol-observable@^1.0.4:
->>>>>>> Cleaned PR + tests.
-=======
 symbol-observable@^1.0.4, symbol-observable@^1.1.0:
->>>>>>> Undoing yarn stuff.
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.1.0.tgz#5c68fd8d54115d9dfb72a84720549222e8db9b32"
 
@@ -11463,19 +10271,6 @@ through2@^0.6.1:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-through2@^2.0.0, through2@^2.0.1, through2@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 through@2, "through@>=2.2.7 <3", through@^2.3.4, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
@@ -11589,25 +10384,6 @@ to-regex@^3.0.1:
     extend-shallow "^2.0.1"
     regex-not "^1.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-touch@3.1.0, touch@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
-  dependencies:
-    nopt "~1.0.10"
-
-tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
-=======
-touch@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/touch/-/touch-1.0.0.tgz#449cbe2dbae5a8c8038e30d71fa0ff464947c4de"
-  dependencies:
-    nopt "~1.0.10"
-
-tough-cookie@^2.2.0, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
->>>>>>> Cleaned PR + tests.
-=======
 touch@3.1.0, touch@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
@@ -11615,7 +10391,6 @@ touch@3.1.0, touch@^3.1.0:
     nopt "~1.0.10"
 
 tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
->>>>>>> Undoing yarn stuff.
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
   dependencies:
@@ -11675,15 +10450,7 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 type-detect@^4.0.0, type-detect@^4.0.5:
-=======
-type-detect@^4.0.0:
->>>>>>> Cleaned PR + tests.
-=======
-type-detect@^4.0.0, type-detect@^4.0.5:
->>>>>>> Undoing yarn stuff.
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.5.tgz#d70e5bc81db6de2a381bcaca0c6e0cbdc7635de2"
 
@@ -11803,19 +10570,10 @@ underscore@~1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 underscore@~1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
 
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
 union-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
@@ -11865,55 +10623,12 @@ unset-value@^1.0.0:
   dependencies:
     has-value "^0.3.1"
     isobject "^3.0.0"
-<<<<<<< HEAD
-=======
-
-<<<<<<< HEAD
-unzip-response@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
->>>>>>> Cleaned PR + tests.
 
-=======
->>>>>>> Undoing yarn stuff.
 unzip-response@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 update-notifier@^2.1.0, update-notifier@^2.3.0:
-=======
-update-notifier@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-0.5.0.tgz#07b5dc2066b3627ab3b4f530130f7eddda07a4cc"
-  dependencies:
-    chalk "^1.0.0"
-    configstore "^1.0.0"
-    is-npm "^1.0.0"
-    latest-version "^1.0.0"
-    repeating "^1.1.2"
-    semver-diff "^2.0.0"
-    string-length "^1.0.0"
-
-update-notifier@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-0.7.0.tgz#143c4533383d08908ef70546206395fe1b5abb06"
-  dependencies:
-    ansi-align "^1.0.0"
-    boxen "^0.5.1"
-    chalk "^1.0.0"
-    configstore "^2.0.0"
-    is-npm "^1.0.0"
-    latest-version "^2.0.0"
-    semver-diff "^2.0.0"
-    xdg-basedir "^2.0.0"
-
-update-notifier@^2.1.0:
->>>>>>> Cleaned PR + tests.
-=======
-update-notifier@^2.1.0, update-notifier@^2.3.0:
->>>>>>> Undoing yarn stuff.
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451"
   dependencies:
@@ -11933,6 +10648,7 @@ upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 >>>>>>> Cleaned PR + tests.
@@ -11944,8 +10660,9 @@ urix@^0.1.0, urix@~0.1.0:
 urix@^0.1.0:
 >>>>>>> Cleaned PR + tests.
 =======
+=======
+>>>>>>> Yarn attempt #2.
 urix@^0.1.0, urix@~0.1.0:
->>>>>>> Undoing yarn stuff.
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
@@ -12043,15 +10760,7 @@ vary@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.0.1.tgz#99e4981566a286118dfb2b817357df7993376d10"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 vary@~1.1.2:
-=======
-vary@~1.1.0, vary@~1.1.2:
->>>>>>> Cleaned PR + tests.
-=======
-vary@~1.1.2:
->>>>>>> Undoing yarn stuff.
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
 
@@ -12197,15 +10906,7 @@ watchify@3.9.0:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 wd@^1.4.0:
-=======
-wd@^1.0.0:
->>>>>>> Cleaned PR + tests.
-=======
-wd@^1.4.0:
->>>>>>> Undoing yarn stuff.
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/wd/-/wd-1.5.0.tgz#45c96a16ff9f8c0f9e7ca90f806a8b48bd0034d6"
   dependencies:
@@ -12267,21 +10968,11 @@ whet.extend@~0.9.9:
   version "0.9.9"
   resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
 which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.14, which@^1.2.9:
-<<<<<<< HEAD
-=======
-which@^1.0.9, which@^1.1.1, which@^1.2.12, which@^1.2.14, which@^1.2.9:
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
   dependencies:
@@ -12293,15 +10984,6 @@ wide-align@^1.1.0:
   dependencies:
     string-width "^1.0.2"
 
-<<<<<<< HEAD
-widest-line@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"
-  dependencies:
-    string-width "^2.1.1"
-
-=======
->>>>>>> Undoing yarn stuff.
 widest-line@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-2.0.0.tgz#0142a4e8a243f8882c0233aa0e0281aa76152273"

From 7a167a80b2173ac5f02dd1a2c09351db0b4b8d6b Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Fri, 12 Jan 2018 17:16:49 -0500
Subject: [PATCH 08/20] Reverting example page.

---
 examples/fluid.amp.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/examples/fluid.amp.html b/examples/fluid.amp.html
index adfbc2acbccf..1a7efa2376a7 100644
--- a/examples/fluid.amp.html
+++ b/examples/fluid.amp.html
@@ -20,12 +20,10 @@
   <body>
     <h1>AMP Static Image DFP Reservation.</h1>
     <p>Tests a static image ad in an AMP page.</p>
-    <!--<div class="artificialfold"></div>
+    <div class="artificialfold"></div>
     <div style="margin-left: 35%; margin-right: 15%; border: 1px red solid">
       <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu0/iu1/iu2" height="fluid"></amp-ad>
     </div>
-    <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu7" height="fluid"></amp-ad>-->
-    <!--<amp-ad type=doubleclick data-slot="/30497360/samfrank_native_v2_a4a" width=320 height=50></amp-ad>-->
-    <amp-ad data-slot="/701/wpni.amp.opinions/blog/plum-line" height=250 layout=fixed type=doubleclick width=300></amp-ad>
+    <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu7" height="fluid"></amp-ad>
   </body>
 </html>

From 1483bdeec56f14c2a8c5f69acabfa94bb5982b67 Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Tue, 16 Jan 2018 14:30:28 -0500
Subject: [PATCH 09/20] lint fix

---
 .../0.1/test/test-amp-ad-network-doubleclick-impl.js            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
index 3b956e6b944b..6d2a664a8877 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
@@ -275,7 +275,7 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
       impl.extractSize({
         get(name) {
           return name == 'amp-nameframe-exp' ?
-              'instantLoad;writeInBody' : undefined;
+            'instantLoad;writeInBody' : undefined;
         },
         has(name) {
           return !!this.get(name);

From 9460a1ff35f800414bcf887979f2b0b93fb97f3f Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Fri, 19 Jan 2018 17:25:29 -0500
Subject: [PATCH 10/20] PR feedback.

---
 3p/nameframe.max.html   | 50 +++++++++++++++++++----------------------
 examples/fluid.amp.html |  5 +++--
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/3p/nameframe.max.html b/3p/nameframe.max.html
index 4928c075eb17..114b2478017a 100644
--- a/3p/nameframe.max.html
+++ b/3p/nameframe.max.html
@@ -7,48 +7,44 @@
     var writeInBody = false;
     var instantLoad = false;
 
-    var tryProtected = function(blockFn) {
+    var errorHandler = function(err) {
+      window.parent.postMessage({type: 'no-content', error: err.message}, '*');
+      window.name = '';
+    }
+
+    var render = function() {
       try {
-        blockFn();
-      } catch (err) {
-        window.parent.postMessage(
-            {type: 'no-content', error: err.message}, '*');
-        window.name = '';
+        document.open();
+        document.write(name_data['creative']);
+        document.close();
+        delete name_data['creative'];
+        window.name = JSON.stringify(name_data);
+      } catch (e) {
+        errorHandler(e);
       }
     };
 
-    tryProtected(function() {
+    try {
       name_data = JSON.parse(window.name);
       writeInBody = name_data['writeInBody'];
       instantLoad = name_data['instantLoad'];
-      if (!name_data || !name_data['creative']) {
+      if (name_data && name_data['creative']) {
+        if (!writeInBody) {
+          instantLoad ? render() : (window.onload = render);
+        }
+      } else {
         throw new Error('Missing or incorrectly formatted JSON ' +
             'input to nameframe');
       }
-    });
-
-    var render = function() {
-      tryProtected(function() {
-        document.open();
-        document.write(name_data['creative']);
-        document.close();
-        delete name_data['creative'];
-        window.name = JSON.stringify(name_data);
-      });
-    };
-    if (!writeInBody && !instantLoad) {
-      window.onload = render;
-    } else if (!writeInBody) {
-      render();
+    } catch (e) {
+      errorHandler(e);
     }
   </script>
 </head>
 <body>
   <script>
-    if (writeInBody && !instantLoad) {
-      window.onload = render;
-    } else if (writeInBody) {
-      render();
+    if (writeInBody) {
+      instantLoad ? render() : (window.onload = render);
     }
   </script>
 </body>
diff --git a/examples/fluid.amp.html b/examples/fluid.amp.html
index 1a7efa2376a7..97c32107b8e1 100644
--- a/examples/fluid.amp.html
+++ b/examples/fluid.amp.html
@@ -20,10 +20,11 @@
   <body>
     <h1>AMP Static Image DFP Reservation.</h1>
     <p>Tests a static image ad in an AMP page.</p>
-    <div class="artificialfold"></div>
+    <!--<div class="artificialfold"></div>
     <div style="margin-left: 35%; margin-right: 15%; border: 1px red solid">
       <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu0/iu1/iu2" height="fluid"></amp-ad>
     </div>
-    <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu7" height="fluid"></amp-ad>
+    <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu7" height="fluid"></amp-ad>-->
+    <amp-ad data-slot="/701/wpni.amp.opinions/blog/plum-line" height=250 layout=fixed type=doubleclick width=300></amp-ad>
   </body>
 </html>

From 5dc4219ee71d5b72bdf0b5df3c0a7249bce62c1a Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Fri, 19 Jan 2018 17:25:56 -0500
Subject: [PATCH 11/20] Undoing changes to test page.

---
 examples/fluid.amp.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/examples/fluid.amp.html b/examples/fluid.amp.html
index 97c32107b8e1..1a7efa2376a7 100644
--- a/examples/fluid.amp.html
+++ b/examples/fluid.amp.html
@@ -20,11 +20,10 @@
   <body>
     <h1>AMP Static Image DFP Reservation.</h1>
     <p>Tests a static image ad in an AMP page.</p>
-    <!--<div class="artificialfold"></div>
+    <div class="artificialfold"></div>
     <div style="margin-left: 35%; margin-right: 15%; border: 1px red solid">
       <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu0/iu1/iu2" height="fluid"></amp-ad>
     </div>
-    <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu7" height="fluid"></amp-ad>-->
-    <amp-ad data-slot="/701/wpni.amp.opinions/blog/plum-line" height=250 layout=fixed type=doubleclick width=300></amp-ad>
+    <amp-ad type=doubleclick data-slot="/30497360/native_v2/iu7" height="fluid"></amp-ad>
   </body>
 </html>

From 3fcdbad2f5d305ae941cf7fe9d03a8676fa0e637 Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Tue, 30 Jan 2018 16:50:00 -0500
Subject: [PATCH 12/20] Merges

---
 yarn.lock | 133 ++++++++++--------------------------------------------
 1 file changed, 25 insertions(+), 108 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3f094f0c1e37..f24bf0ef9087 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -144,28 +144,7 @@ JSONStream@^1.0.3:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 abab@^1.0.4:
-=======
-=======
->>>>>>> Undoing yarn stuff.
-<<<<<<< HEAD
-abab@^1.0.3:
-=======
-abab@^1.0.0:
->>>>>>> Cleaned PR + tests.
-<<<<<<< HEAD
->>>>>>> Cleaned PR + tests.
-=======
-=======
-abab@^1.0.3:
->>>>>>> Undoing yarn stuff.
->>>>>>> Undoing yarn stuff.
-=======
-abab@^1.0.3:
->>>>>>> Yarn attempt #2.
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
 
@@ -222,27 +201,7 @@ acorn@^4.0.3:
   version "4.0.13"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 acorn@^5.0.0, acorn@^5.0.3, acorn@^5.2.1:
-=======
-=======
->>>>>>> Undoing yarn stuff.
-<<<<<<< HEAD
-acorn@^5.0.0, acorn@^5.0.3, acorn@^5.1.2, acorn@^5.2.1:
->>>>>>> Cleaned PR + tests.
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
-=======
-acorn@^5.2.1:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.3.0.tgz#7446d39459c54fb49a80e6ee6478149b940ec822"
->>>>>>> Cleaned PR + tests.
-=======
-=======
->>>>>>> Yarn attempt #2.
-acorn@^5.0.0, acorn@^5.0.3, acorn@^5.1.2, acorn@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.2.1.tgz#317ac7821826c22c702d66189ab8359675f135d7"
 
@@ -295,6 +254,7 @@ ajv-keywords@^2.1.0:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 ajv@6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
@@ -324,6 +284,11 @@ ajv@5.5.2, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
 >>>>>>> Yarn attempt #2.
+=======
+ajv@6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
+>>>>>>> Merges
   dependencies:
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
@@ -339,10 +304,13 @@ ajv@^4.9.1:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
+=======
+>>>>>>> Merges
 ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -352,6 +320,7 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 >>>>>>> Cleaned PR + tests.
@@ -360,6 +329,8 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
 >>>>>>> Undoing yarn stuff.
 =======
 >>>>>>> Yarn attempt #2.
+=======
+>>>>>>> Merges
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -444,25 +415,10 @@ ansi-styles@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
 
-<<<<<<< HEAD
 ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
-=======
-ansi-wrap@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-any-promise@^0.1.0:
->>>>>>> Cleaned PR + tests.
->>>>>>> Cleaned PR + tests.
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-
-=======
->>>>>>> Undoing yarn stuff.
-=======
->>>>>>> Yarn attempt #2.
 any-shell-escape@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/any-shell-escape/-/any-shell-escape-0.1.1.tgz#d55ab972244c71a9a5e1ab0879f30bf110806959"
@@ -2692,28 +2648,7 @@ content-type@~1.0.1, content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 convert-source-map@1.X, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
-=======
-=======
->>>>>>> Undoing yarn stuff.
-<<<<<<< HEAD
-convert-source-map@1.X, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0:
-=======
-convert-source-map@^1.0.0, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0:
->>>>>>> Cleaned PR + tests.
-<<<<<<< HEAD
->>>>>>> Cleaned PR + tests.
-=======
-=======
-convert-source-map@1.X, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0:
->>>>>>> Undoing yarn stuff.
->>>>>>> Undoing yarn stuff.
-=======
-convert-source-map@1.X, convert-source-map@^1.1.3, convert-source-map@^1.2.0, convert-source-map@^1.5.0:
->>>>>>> Yarn attempt #2.
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
@@ -3295,6 +3230,7 @@ diffie-hellman@^5.0.0:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 doctrine@2.1.0, doctrine@^2.1.0:
 =======
 =======
@@ -3302,10 +3238,13 @@ doctrine@2.1.0, doctrine@^2.1.0:
 =======
 >>>>>>> Yarn attempt #2.
 <<<<<<< HEAD
+=======
+>>>>>>> Merges
 direction@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/direction/-/direction-1.0.1.tgz#0481cc6eb44b4bb0c00da0ddb10a91469bbffe5d"
 
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 >>>>>>> Cleaned PR + tests.
@@ -3329,6 +3268,8 @@ doctrine@^2.0.0:
 >>>>>>> Yarn attempt #2.
 =======
 >>>>>>> Yarn attempt #2.
+=======
+>>>>>>> Merges
 doctrine@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@@ -4122,28 +4063,7 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 fancy-log@1.3.2, fancy-log@^1.1.0, fancy-log@^1.2.0, fancy-log@^1.3.2:
-=======
-=======
->>>>>>> Undoing yarn stuff.
-<<<<<<< HEAD
-fancy-log@^1.1.0, fancy-log@^1.2.0, fancy-log@^1.3.2:
-=======
-fancy-log@^1.1.0:
->>>>>>> Cleaned PR + tests.
-<<<<<<< HEAD
->>>>>>> Cleaned PR + tests.
-=======
-=======
-fancy-log@^1.1.0, fancy-log@^1.2.0, fancy-log@^1.3.2:
->>>>>>> Undoing yarn stuff.
->>>>>>> Undoing yarn stuff.
-=======
-fancy-log@^1.1.0, fancy-log@^1.2.0, fancy-log@^1.3.2:
->>>>>>> Yarn attempt #2.
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
   dependencies:
@@ -7607,16 +7527,6 @@ object-copy@^0.1.0:
     copy-descriptor "^0.1.0"
     define-property "^0.2.5"
     kind-of "^3.0.3"
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-object-keys@^1.0.10, object-keys@^1.0.8:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Yarn attempt #2.
 
 object-keys@^1.0.10, object-keys@^1.0.8:
   version "1.0.11"
@@ -7643,12 +7553,15 @@ object.assign@^4.0.4:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 =======
 >>>>>>> Undoing yarn stuff.
 =======
 >>>>>>> Yarn attempt #2.
 <<<<<<< HEAD
+=======
+>>>>>>> Merges
 object.assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
@@ -7658,6 +7571,7 @@ object.assign@^4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
+<<<<<<< HEAD
 =======
 >>>>>>> Undoing yarn stuff.
 =======
@@ -7672,6 +7586,8 @@ object.assign@^4.1.0:
 >>>>>>> Undoing yarn stuff.
 =======
 >>>>>>> Yarn attempt #2.
+=======
+>>>>>>> Merges
 object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
@@ -11184,3 +11100,4 @@ zip-stream@^1.1.0:
     compress-commons "^1.2.0"
     lodash "^4.8.0"
     readable-stream "^2.0.0"
+

From 45dfca38519da20d0f80e256fb8170932e620f09 Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Tue, 30 Jan 2018 16:54:56 -0500
Subject: [PATCH 13/20] Yarn

---
 yarn.lock | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/yarn.lock b/yarn.lock
index f24bf0ef9087..d3dc888ccad3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -255,6 +255,7 @@ ajv-keywords@^2.1.0:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 ajv@6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
@@ -289,7 +290,13 @@ ajv@6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
 >>>>>>> Merges
+=======
+ajv@5.5.2, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+>>>>>>> Yarn
   dependencies:
+    co "^4.6.0"
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
@@ -305,6 +312,7 @@ ajv@^4.9.1:
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -331,6 +339,8 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
 >>>>>>> Yarn attempt #2.
 =======
 >>>>>>> Merges
+=======
+>>>>>>> Yarn
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -11100,4 +11110,3 @@ zip-stream@^1.1.0:
     compress-commons "^1.2.0"
     lodash "^4.8.0"
     readable-stream "^2.0.0"
-

From bf3cb5e039edd8951abf66859240478a1ec3d4a6 Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Wed, 31 Jan 2018 14:07:55 -0500
Subject: [PATCH 14/20] Not calling document.open/close when writing in body
 and not waiting for onload. Also removed accidentally merged tests.

---
 3p/nameframe.max.html                         |  8 ++++--
 .../test-amp-ad-network-doubleclick-impl.js   | 25 -------------------
 2 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/3p/nameframe.max.html b/3p/nameframe.max.html
index 114b2478017a..cd01e663d7a4 100644
--- a/3p/nameframe.max.html
+++ b/3p/nameframe.max.html
@@ -14,9 +14,13 @@
 
     var render = function() {
       try {
-        document.open();
+        if (!writeInBody || !instantLoad) {
+          document.open();
+        }
         document.write(name_data['creative']);
-        document.close();
+        if (!writeInBody || !instantLoad) {
+          document.close();
+        }
         delete name_data['creative'];
         window.name = JSON.stringify(name_data);
       } catch (e) {
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
index 6d2a664a8877..d80ed1f8ab51 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
@@ -233,31 +233,6 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
           'https://c.com?e=f,https://d.com?g=h', true)).to.be.calledOnce;
     });
 
-    it('should initialize refresh manager', () => {
-      impl.extractSize({
-        get(name) {
-          return name == 'amp-force-refresh' ? '30' : undefined;
-        },
-        has(name) {
-          return !!this.get(name);
-        },
-      });
-      expect(impl.element.getAttribute(DATA_ATTR_NAME)).to.equal('30');
-    });
-
-    it('should not override publisher\'s refresh settings', () => {
-      impl.refreshManager_ = {refreshInterval_: '45'};
-      impl.extractSize({
-        get(name) {
-          return name == 'amp-force-refresh' ? '30' : undefined;
-        },
-        has(name) {
-          return !!this.get(name);
-        },
-      });
-      expect(impl.refreshManager_.refreshInterval_).to.equal('45');
-    });
-
     it('should specify nameframe loading behavior; single arg', () => {
       impl.extractSize({
         get(name) {

From bf20c392efc30c61af589e7d6929ef704acebad6 Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Tue, 6 Feb 2018 11:19:07 -0500
Subject: [PATCH 15/20] Adding back document.open/close into default flow.

---
 3p/nameframe.max.html | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/3p/nameframe.max.html b/3p/nameframe.max.html
index cd01e663d7a4..114b2478017a 100644
--- a/3p/nameframe.max.html
+++ b/3p/nameframe.max.html
@@ -14,13 +14,9 @@
 
     var render = function() {
       try {
-        if (!writeInBody || !instantLoad) {
-          document.open();
-        }
+        document.open();
         document.write(name_data['creative']);
-        if (!writeInBody || !instantLoad) {
-          document.close();
-        }
+        document.close();
         delete name_data['creative'];
         window.name = JSON.stringify(name_data);
       } catch (e) {

From 4f93264a5038c39fae830b419687190e895323bf Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Tue, 6 Feb 2018 12:42:06 -0500
Subject: [PATCH 16/20] Simplified conditional.

---
 3p/nameframe.max.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/3p/nameframe.max.html b/3p/nameframe.max.html
index 114b2478017a..1df56224831e 100644
--- a/3p/nameframe.max.html
+++ b/3p/nameframe.max.html
@@ -28,14 +28,13 @@
       name_data = JSON.parse(window.name);
       writeInBody = name_data['writeInBody'];
       instantLoad = name_data['instantLoad'];
-      if (name_data && name_data['creative']) {
-        if (!writeInBody) {
-          instantLoad ? render() : (window.onload = render);
-        }
-      } else {
+      if (!name_data || !name_data['creative']) {
         throw new Error('Missing or incorrectly formatted JSON ' +
             'input to nameframe');
       }
+      if (!writeInBody) {
+        instantLoad ? render() : (window.onload = render);
+      }
     } catch (e) {
       errorHandler(e);
     }

From bd63d36d4b071a8b171673812d26ff38acb76567 Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Tue, 6 Feb 2018 16:00:23 -0500
Subject: [PATCH 17/20] Adsense support.

---
 .../0.1/amp-ad-network-adsense-impl.js        | 24 +++++++++++++++
 .../test/test-amp-ad-network-adsense-impl.js  | 29 +++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
index f87ce8cf2531..595665abcbb2 100644
--- a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
+++ b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
@@ -39,6 +39,7 @@ import {
 } from '../../../ads/google/a4a/utils';
 import {Services} from '../../../src/services';
 import {clamp} from '../../../src/utils/math';
+import {dict} from '../../../src/utils/object';
 import {
   computedStyle,
   setStyle,
@@ -150,6 +151,12 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
      * indicates no creative render.
      */
     this.isAmpCreative_ = null;
+
+    /** @private {{instantLoad: boolean, writeInBody: boolean}} */
+    this.nameframeExperimentConfig_ = {
+      instantLoad: false,
+      writeInBody: false,
+    };
   }
 
   /**
@@ -327,9 +334,26 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
       this.extensions_./*OK*/installExtensionForDoc(
           this.getAmpDoc(), 'amp-analytics');
     }
+
+    const nameframeExperimentConfig = responseHeaders.get('amp-nameframe-exp');
+    if (nameframeExperimentConfig) {
+      nameframeExperimentConfig.split(';').forEach(config => {
+        if (config == 'instantLoad' || config == 'writeInBody') {
+          this.nameframeExperimentConfig_[config] = true;
+        }
+      });
+    }
+
     return this.size_;
   }
 
+  /** @override */
+  getAdditionalContextMetadata() {
+    const attributes = dict({});
+    Object.assign(attributes, this.nameframeExperimentConfig_);
+    return attributes;
+  }
+
   /**
    * @param {string} format
    * @return {string} The ad unit hash key string.
diff --git a/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js b/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js
index bad6addebdec..5a4b8266fc1a 100644
--- a/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js
+++ b/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js
@@ -898,4 +898,33 @@ describes.realWin('amp-ad-network-adsense-impl', {
           .to.be.true;
     });
   });
+
+  describe('#nameframeExperiment', () => {
+    it('should specify nameframe loading behavior; single arg', () => {
+      impl.extractSize({
+        get(name) {
+          return name == 'amp-nameframe-exp' ? 'instantLoad' : undefined;
+        },
+        has(name) {
+          return !!this.get(name);
+        },
+      });
+      expect(impl.nameframeExperimentConfig_.instantLoad).to.be.true;
+      expect(impl.nameframeExperimentConfig_.writeInBody).to.be.false;
+    });
+
+    it('should specify nameframe loading behavior; two args', () => {
+      impl.extractSize({
+        get(name) {
+          return name == 'amp-nameframe-exp' ?
+            'instantLoad;writeInBody' : undefined;
+        },
+        has(name) {
+          return !!this.get(name);
+        },
+      });
+      expect(impl.nameframeExperimentConfig_.instantLoad).to.be.true;
+      expect(impl.nameframeExperimentConfig_.writeInBody).to.be.true;
+    });
+  });
 });

From 3a590a89e637e07db8df61e86e4206d255573ec6 Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Tue, 6 Feb 2018 16:48:06 -0500
Subject: [PATCH 18/20] Merges/rebase.

---
 yarn.lock | 226 ------------------------------------------------------
 1 file changed, 226 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d3dc888ccad3..5937cd8539dd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -251,52 +251,10 @@ ajv-keywords@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 ajv@6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
-=======
-=======
->>>>>>> Undoing yarn stuff.
-<<<<<<< HEAD
-ajv@5.5.2, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-=======
-ajv@5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.2.2.tgz#47c68d69e86f5d953103b0074a9430dc63da5e39"
->>>>>>> Cleaned PR + tests.
-<<<<<<< HEAD
->>>>>>> Cleaned PR + tests.
-=======
-=======
-ajv@5.5.2, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
->>>>>>> Undoing yarn stuff.
->>>>>>> Undoing yarn stuff.
-=======
-ajv@5.5.2, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
->>>>>>> Yarn attempt #2.
-=======
-ajv@6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.1.1.tgz#978d597fbc2b7d0e5a5c3ddeb149a682f2abfa0e"
->>>>>>> Merges
-=======
-ajv@5.5.2, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
->>>>>>> Yarn
   dependencies:
-    co "^4.6.0"
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
@@ -308,17 +266,6 @@ ajv@^4.9.1:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Merges
 ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -328,19 +275,6 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
->>>>>>> Cleaned PR + tests.
-=======
->>>>>>> Undoing yarn stuff.
-=======
->>>>>>> Yarn attempt #2.
-=======
->>>>>>> Merges
-=======
->>>>>>> Yarn
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
@@ -1681,34 +1615,6 @@ braces@^2.3.0:
     split-string "^3.0.2"
     to-regex "^3.0.1"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
->>>>>>> Undoing yarn stuff.
-=======
->>>>>>> Yarn attempt #2.
-brcast@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/brcast/-/brcast-2.0.2.tgz#2db16de44140e418dc37fab10beec0369e78dcef"
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> Cleaned PR + tests.
-<<<<<<< HEAD
->>>>>>> Cleaned PR + tests.
-=======
-=======
->>>>>>> Undoing yarn stuff.
->>>>>>> Undoing yarn stuff.
-=======
->>>>>>> Yarn attempt #2.
 brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -2220,40 +2126,9 @@ class-utils@^0.3.5:
     arr-union "^3.1.0"
     define-property "^0.2.5"
     isobject "^3.0.0"
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
     lazy-cache "^2.0.2"
     static-extend "^0.1.1"
 
-<<<<<<< HEAD
-=======
-classnames@^2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
-
-=======
-    static-extend "^0.1.1"
-
->>>>>>> Cleaned PR + tests.
-<<<<<<< HEAD
->>>>>>> Cleaned PR + tests.
-=======
-=======
-=======
->>>>>>> Yarn attempt #2.
-    lazy-cache "^2.0.2"
-    static-extend "^0.1.1"
-
-classnames@^2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
-
-<<<<<<< HEAD
->>>>>>> Undoing yarn stuff.
->>>>>>> Undoing yarn stuff.
-=======
->>>>>>> Yarn attempt #2.
 clean-stack@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-1.3.0.tgz#9e821501ae979986c46b1d66d2d432db2fd4ae31"
@@ -3237,50 +3112,7 @@ diffie-hellman@^5.0.0:
     miller-rabin "^4.0.0"
     randombytes "^2.0.0"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 doctrine@2.1.0, doctrine@^2.1.0:
-=======
-=======
->>>>>>> Undoing yarn stuff.
-=======
->>>>>>> Yarn attempt #2.
-<<<<<<< HEAD
-=======
->>>>>>> Merges
-direction@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/direction/-/direction-1.0.1.tgz#0481cc6eb44b4bb0c00da0ddb10a91469bbffe5d"
-
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
->>>>>>> Cleaned PR + tests.
-=======
-<<<<<<< HEAD
->>>>>>> Undoing yarn stuff.
-<<<<<<< HEAD
-doctrine@2.1.0:
->>>>>>> Cleaned PR + tests.
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  dependencies:
-    esutils "^2.0.2"
-
-doctrine@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.2.tgz#68f96ce8efc56cc42651f1faadb4f175273b0075"
-=======
-doctrine@^2.0.0:
-=======
->>>>>>> Yarn attempt #2.
-=======
->>>>>>> Yarn attempt #2.
-=======
->>>>>>> Merges
-doctrine@2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
   dependencies:
@@ -7560,44 +7392,6 @@ object.assign@^4.0.4:
     function-bind "^1.1.0"
     object-keys "^1.0.10"
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> Undoing yarn stuff.
-=======
->>>>>>> Yarn attempt #2.
-<<<<<<< HEAD
-=======
->>>>>>> Merges
-object.assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
-  dependencies:
-    define-properties "^1.1.2"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    object-keys "^1.0.11"
-
-<<<<<<< HEAD
-=======
->>>>>>> Undoing yarn stuff.
-=======
-=======
->>>>>>> Cleaned PR + tests.
->>>>>>> Cleaned PR + tests.
-<<<<<<< HEAD
->>>>>>> Cleaned PR + tests.
-=======
-=======
->>>>>>> Undoing yarn stuff.
->>>>>>> Undoing yarn stuff.
-=======
->>>>>>> Yarn attempt #2.
-=======
->>>>>>> Merges
 object.defaults@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
@@ -10568,26 +10362,6 @@ update-notifier@^2.1.0, update-notifier@^2.3.0:
     semver-diff "^2.0.0"
     xdg-basedir "^3.0.0"
 
-<<<<<<< HEAD
-=======
-upper-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> Cleaned PR + tests.
-=======
-<<<<<<< HEAD
->>>>>>> Undoing yarn stuff.
-urix@^0.1.0, urix@~0.1.0:
-=======
-urix@^0.1.0:
->>>>>>> Cleaned PR + tests.
-=======
-=======
->>>>>>> Yarn attempt #2.
 urix@^0.1.0, urix@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"

From 2566cb241bd8f3b2046ef4847cb1cad63950f703 Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Tue, 6 Feb 2018 17:18:35 -0500
Subject: [PATCH 19/20] Alphabetized imports.

---
 .../0.1/amp-ad-network-adsense-impl.js                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
index 595665abcbb2..fa741e8c58c3 100644
--- a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
+++ b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
@@ -39,13 +39,13 @@ import {
 } from '../../../ads/google/a4a/utils';
 import {Services} from '../../../src/services';
 import {clamp} from '../../../src/utils/math';
-import {dict} from '../../../src/utils/object';
 import {
   computedStyle,
   setStyle,
   setStyles,
 } from '../../../src/style';
 import {dev, user} from '../../../src/log';
+import {dict} from '../../../src/utils/object';
 import {domFingerprintPlain} from '../../../src/utils/dom-fingerprint';
 import {
   getAdSenseAmpAutoAdsExpBranch,

From 88ae692d873b1c15a96db4658113f0baee64358e Mon Sep 17 00:00:00 2001
From: Gene Levitzky <levitzky@google.com>
Date: Wed, 7 Feb 2018 13:58:16 -0500
Subject: [PATCH 20/20] Factored out common code to utils.

---
 ads/google/a4a/utils.js                       | 21 +++++++++++++++++++
 .../0.1/amp-ad-network-adsense-impl.js        | 15 ++++---------
 .../0.1/amp-ad-network-doubleclick-impl.js    | 13 ++++--------
 3 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/ads/google/a4a/utils.js b/ads/google/a4a/utils.js
index 0327de7f143b..f17ed567463c 100644
--- a/ads/google/a4a/utils.js
+++ b/ads/google/a4a/utils.js
@@ -80,6 +80,11 @@ export const EXPERIMENT_ATTRIBUTE = 'data-experiment-id';
  */
 export let AmpAnalyticsConfigDef;
 
+/**
+ * @typedef {{instantLoad: boolean, writeInBody: boolean}}
+ */
+export let NameframeExperimentConfig;
+
 /**
  * @const {!./url-builder.QueryParameterDef}
  * @visibleForTesting
@@ -806,3 +811,19 @@ export function isCdnProxy(win) {
     /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org((\/.*)|($))+/;
   return googleCdnProxyRegex.test(win.location.origin);
 }
+
+/**
+ * Populates the fields of the given Nameframe experiment config object.
+ * @param {!../../../src/service/xhr-impl.FetchResponseHeaders} headers
+ * @param {!NameframeExperimentConfig} nameframeConfig
+ */
+export function setNameframeExperimentConfigs(headers, nameframeConfig) {
+  const nameframeExperimentHeader = headers.get('amp-nameframe-exp');
+  if (nameframeExperimentHeader) {
+    nameframeExperimentHeader.split(';').forEach(config => {
+      if (config == 'instantLoad' || config == 'writeInBody') {
+        nameframeConfig[config] = true;
+      }
+    });
+  }
+}
diff --git a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
index fa741e8c58c3..8b72351e3e46 100644
--- a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
+++ b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
@@ -36,6 +36,7 @@ import {
   googleAdUrl,
   isReportingEnabled,
   maybeAppendErrorParameter,
+  setNameframeExperimentConfigs,
 } from '../../../ads/google/a4a/utils';
 import {Services} from '../../../src/services';
 import {clamp} from '../../../src/utils/math';
@@ -152,7 +153,7 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
      */
     this.isAmpCreative_ = null;
 
-    /** @private {{instantLoad: boolean, writeInBody: boolean}} */
+    /** @private {!../../../ads/google/a4a/utils.NameframeExperimentConfig} */
     this.nameframeExperimentConfig_ = {
       instantLoad: false,
       writeInBody: false,
@@ -334,16 +335,8 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
       this.extensions_./*OK*/installExtensionForDoc(
           this.getAmpDoc(), 'amp-analytics');
     }
-
-    const nameframeExperimentConfig = responseHeaders.get('amp-nameframe-exp');
-    if (nameframeExperimentConfig) {
-      nameframeExperimentConfig.split(';').forEach(config => {
-        if (config == 'instantLoad' || config == 'writeInBody') {
-          this.nameframeExperimentConfig_[config] = true;
-        }
-      });
-    }
-
+    setNameframeExperimentConfigs(responseHeaders,
+        this.nameframeExperimentConfig_);
     return this.size_;
   }
 
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
index 00c45b7e2270..0cebbcde2769 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
@@ -45,6 +45,7 @@ import {
   isCdnProxy,
   isReportingEnabled,
   maybeAppendErrorParameter,
+  setNameframeExperimentConfigs,
   truncAndTimeUrl,
 } from '../../../ads/google/a4a/utils';
 import {
@@ -376,7 +377,7 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     /** @private {boolean} */
     this.isIdleRender_ = false;
 
-    /** @private {{instantLoad: boolean, writeInBody: boolean}} */
+    /** @private {!../../../ads/google/a4a/utils.NameframeExperimentConfig} */
     this.nameframeExperimentConfig_ = {
       instantLoad: false,
       writeInBody: false,
@@ -808,14 +809,8 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
           this.getAmpDoc(), 'amp-analytics');
     }
 
-    const nameframeExperimentConfig = responseHeaders.get('amp-nameframe-exp');
-    if (nameframeExperimentConfig) {
-      nameframeExperimentConfig.split(';').forEach(config => {
-        if (config == 'instantLoad' || config == 'writeInBody') {
-          this.nameframeExperimentConfig_[config] = true;
-        }
-      });
-    }
+    setNameframeExperimentConfigs(responseHeaders,
+        this.nameframeExperimentConfig_);
 
     if (this.isFluid_) {
       this.fluidImpressionUrl_ = responseHeaders.get('X-AmpImps');
