diff --git a/docs/index.bs b/docs/index.bs
index 7c825526..3c1887e8 100644
--- a/docs/index.bs
+++ b/docs/index.bs
@@ -202,7 +202,7 @@ spec: webappsec-referrer-policy; urlPrefix: https://w3c.github.io/webappsec-refe
 
     A [=/service worker registration=] has an associated <dfn export id="dfn-last-update-check-time">last update check time</dfn>. It is initially set to null.
 
-    A [=/service worker registration=] has an associated <dfn export id="dfn-update-via-cache">update via cache mode</dfn>, which is "`imports`", "`all`", or "`never`". It is initially set to "`imports`".
+    A [=/service worker registration=] has an associated <dfn export id="dfn-update-via-cache">update via cache mode</dfn>, which is "`imports`", "`all`", or "`none`". It is initially set to "`imports`".
 
     A [=/service worker registration=] has an associated <dfn export id="dfn-uninstalling-flag">uninstalling flag</dfn>. It is initially unset.
 
@@ -2303,7 +2303,7 @@ spec: webappsec-referrer-policy; urlPrefix: https://w3c.github.io/webappsec-refe
             1. Let |registration| be |serviceWorker|'s [=containing service worker registration=].
             1. Set |request|'s [=service-workers mode=] to "`foreign`".
             1. Set |request|'s [=request/cache mode=] to "<code>no-cache</code>" if any of the following are true:
-                * |registration|'s [=service worker registration/update via cache mode=] is "`never`".
+                * |registration|'s [=service worker registration/update via cache mode=] is "`none`".
                 * The [=current global object=]'s [=force bypass cache for importscripts flag=] is set.
                 * |registration|'s [=last update check time=] is not null and the time difference in seconds calculated by the current time minus |registration|’s [=last update check time=] is greater than 86400.
             1. Let |response| be the result of <a lt="fetch">fetching</a> |request|.
@@ -2419,7 +2419,7 @@ spec: webappsec-referrer-policy; urlPrefix: https://w3c.github.io/webappsec-refe
 
     A <a>job</a> has a <dfn id="dfn-job-worker-type">worker type</dfn> ("<code>classic</code>" or "<code>module</code>").
 
-    A <a>job</a> has an <dfn id="dfn-job-update-via-cache-mode">update via cache mode</dfn>, which is "`imports`", "`all`", or "`never`".
+    A <a>job</a> has an <dfn id="dfn-job-update-via-cache-mode">update via cache mode</dfn>, which is "`imports`", "`all`", or "`none`".
 
     A <a>job</a> has a <dfn id="dfn-job-client">client</dfn> (a [=/service worker client=]). It is initially null.
 
diff --git a/docs/index.html b/docs/index.html
index fbe5fbc9..72eabea9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1177,11 +1177,7 @@
 		}
 	}
 </style>
-<<<<<<< HEAD
-  <meta content="Bikeshed version 5eac41affc3976771f238ed8f80db1c877b65b40" name="generator">
-=======
-  <meta content="Bikeshed version 588c13f032a881310dc4886e2269c4ffd3b6784b" name="generator">
->>>>>>> Changing useCache boolean to updateViaCache enum
+  <meta content="Bikeshed version 34209db86579ed3f0e75afb470f2788a2646155f" name="generator">
   <link href="https://www.w3.org/TR/service-workers/" rel="canonical">
 <style>/* style-md-lists */
 
@@ -1429,7 +1425,7 @@
   <div class="head">
    <p data-fill-with="logo"><a class="logo" href="https://www.w3.org/"> <img alt="W3C" height="48" src="https://www.w3.org/StyleSheets/TR/2016/logos/W3C" width="72"> </a> </p>
    <h1 class="p-name no-ref" id="title">Service Workers Nightly</h1>
-   <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft, <time class="dt-updated" datetime="2017-05-30">30 May 2017</time></span></h2>
+   <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft, <time class="dt-updated" datetime="2017-06-05">5 June 2017</time></span></h2>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
@@ -1803,7 +1799,7 @@ <h3 class="heading settled" data-level="2.2" id="service-worker-registration-con
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-8">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-waiting-worker">waiting worker</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker-35">service worker</a> or null) whose <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state-2">state</a> is <em>installed</em>. It is initially set to null.</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-9">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-active-worker">active worker</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker-36">service worker</a> or null) whose <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state-3">state</a> is either <em>activating</em> or <em>activated</em>. It is initially set to null.</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-10">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-last-update-check-time">last update check time</dfn>. It is initially set to null.</p>
-     <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-11">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-update-via-cache">update via cache mode</dfn>, which is "<code>imports</code>", "<code>all</code>", or "<code>never</code>". It is initially set to "<code>imports</code>".</p>
+     <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-11">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-update-via-cache">update via cache mode</dfn>, which is "<code>imports</code>", "<code>all</code>", or "<code>none</code>". It is initially set to "<code>imports</code>".</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-12">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-uninstalling-flag">uninstalling flag</dfn>. It is initially unset.</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-13">service worker registration</a> has one or more <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-service-worker-registration-task-queue">task queues</dfn> that back up the <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-task">tasks</a> from its <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker-2">active worker</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop">event loop</a>’s corresponding <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-queue">task queues</a>. (The target task sources for this back up operation are the <a data-link-type="dfn" href="#dfn-handle-fetch-task-source" id="ref-for-dfn-handle-fetch-task-source-1">handle fetch task source</a> and the <a data-link-type="dfn" href="#dfn-handle-functional-event-task-source" id="ref-for-dfn-handle-functional-event-task-source-1">handle functional event task source</a>.) The user agent dumps the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker-3">active worker</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-task">tasks</a> to the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-14">service worker registration</a>'s <a data-link-type="dfn" href="#dfn-service-worker-registration-task-queue" id="ref-for-dfn-service-worker-registration-task-queue-1">task queues</a> when the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker-4">active worker</a> is <a data-link-type="dfn" href="#terminate-service-worker" id="ref-for-terminate-service-worker-2">terminated</a> and <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#queue-a-task">re-queues those tasks</a> to the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker-5">active worker</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop">event loop</a>’s corresponding <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-queue">task queues</a> when the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker-6">active worker</a> spins off. Unlike the <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-queue">task queues</a> owned by <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop">event loops</a>, the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-15">service worker registration</a>'s <a data-link-type="dfn" href="#dfn-service-worker-registration-task-queue" id="ref-for-dfn-service-worker-registration-task-queue-2">task queues</a> are not processed by any <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop">event loops</a> in and of itself.</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-16">service worker registration</a> has an associated <dfn data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="service-worker-registration-navigationpreloadmanager"><code class="idl"><a data-link-type="idl" href="#navigationpreloadmanager" id="ref-for-navigationpreloadmanager-1">NavigationPreloadManager</a></code><a class="self-link" href="#service-worker-registration-navigationpreloadmanager"></a></dfn> object.</p>
@@ -1861,20 +1857,12 @@ <h2 class="heading settled" data-level="3" id="document-context"><span class="se
      <a class="self-link" href="#example-7e94092e"></a> Bootstrapping with a service worker: 
 <pre class="highlight"><span class="c1">// scope defaults to the path the script sits in
 </span><span class="c1">// "/" in this example
-<<<<<<< HEAD
 </span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/serviceworker.js"</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span>registration <span class="p">=></span> <span class="p">{</span>
-=======
-</span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/serviceworker.js"</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span>registration <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   console<span class="p">.</span>log<span class="p">(</span><span class="s2">"success!"</span><span class="p">)</span><span class="p">;</span>
   <span class="k">if</span> <span class="p">(</span>registration<span class="p">.</span>installing<span class="p">)</span> <span class="p">{</span>
     registration<span class="p">.</span>installing<span class="p">.</span>postMessage<span class="p">(</span><span class="s2">"Howdy from your installing page."</span><span class="p">)</span><span class="p">;</span>
   <span class="p">}</span>
-<<<<<<< HEAD
 <span class="p">}</span><span class="p">,</span> err <span class="p">=></span> <span class="p">{</span>
-=======
-<span class="p">}</span><span class="p">,</span> err <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   console<span class="p">.</span>error<span class="p">(</span><span class="s2">"Installing the worker failed!"</span><span class="p">,</span> err<span class="p">)</span><span class="p">;</span>
 <span class="p">}</span><span class="p">)</span><span class="p">;</span>
 </pre>
@@ -1998,10 +1986,10 @@ <h3 class="heading settled" data-level="3.2" id="serviceworkerregistration-inter
   <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/webappapis.html#eventhandler">EventHandler</a> <a class="nv idl-code" data-link-type="attribute" data-type="EventHandler" href="#dom-serviceworkerregistration-onupdatefound" id="ref-for-dom-serviceworkerregistration-onupdatefound-1">onupdatefound</a>;
 };
 
-<span class="kt">enum</span> <dfn class="nv dfn-paneled idl-code" data-dfn-type="enum" data-export="" id="enumdef-serviceworkerupdateviacache">ServiceWorkerUpdateViaCache</dfn> {
-  <dfn class="s idl-code" data-dfn-for="ServiceWorkerUpdateViaCache" data-dfn-type="enum-value" data-export="" data-lt="&quot;imports&quot;|imports" id="dom-serviceworkerupdateviacache-imports">"imports"<a class="self-link" href="#dom-serviceworkerupdateviacache-imports"></a></dfn>,
-  <dfn class="s idl-code" data-dfn-for="ServiceWorkerUpdateViaCache" data-dfn-type="enum-value" data-export="" data-lt="&quot;all&quot;|all" id="dom-serviceworkerupdateviacache-all">"all"<a class="self-link" href="#dom-serviceworkerupdateviacache-all"></a></dfn>,
-  <dfn class="s idl-code" data-dfn-for="ServiceWorkerUpdateViaCache" data-dfn-type="enum-value" data-export="" data-lt="&quot;none&quot;|none" id="dom-serviceworkerupdateviacache-none">"none"<a class="self-link" href="#dom-serviceworkerupdateviacache-none"></a></dfn>
+<span class="kt">enum</span> <dfn class="nv dfn-paneled idl-code" data-dfn-type="enum" data-export="" id="enumdef-serviceworkerupdateviacache"><code>ServiceWorkerUpdateViaCache</code></dfn> {
+  <dfn class="s idl-code" data-dfn-for="ServiceWorkerUpdateViaCache" data-dfn-type="enum-value" data-export="" data-lt="&quot;imports&quot;|imports" id="dom-serviceworkerupdateviacache-imports"><code>"imports"</code><a class="self-link" href="#dom-serviceworkerupdateviacache-imports"></a></dfn>,
+  <dfn class="s idl-code" data-dfn-for="ServiceWorkerUpdateViaCache" data-dfn-type="enum-value" data-export="" data-lt="&quot;all&quot;|all" id="dom-serviceworkerupdateviacache-all"><code>"all"</code><a class="self-link" href="#dom-serviceworkerupdateviacache-all"></a></dfn>,
+  <dfn class="s idl-code" data-dfn-for="ServiceWorkerUpdateViaCache" data-dfn-type="enum-value" data-export="" data-lt="&quot;none&quot;|none" id="dom-serviceworkerupdateviacache-none"><code>"none"</code><a class="self-link" href="#dom-serviceworkerupdateviacache-none"></a></dfn>
 };
 </pre>
      <p>A <code class="idl"><a data-link-type="idl" href="#serviceworkerregistration" id="ref-for-serviceworkerregistration-3">ServiceWorkerRegistration</a></code> object represents a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-34">service worker registration</a>. Each <code class="idl"><a data-link-type="idl" href="#serviceworkerregistration" id="ref-for-serviceworkerregistration-4">ServiceWorkerRegistration</a></code> object is associated with a <dfn class="dfn-paneled" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="dfn" data-noexport="" id="serviceworkerregistration-service-worker-registration">service worker registration</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-35">service worker registration</a>). Multiple separate objects implementing the <code class="idl"><a data-link-type="idl" href="#serviceworkerregistration" id="ref-for-serviceworkerregistration-5">ServiceWorkerRegistration</a></code> interface across documents and workers can all be associated with the same <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-36">service worker registration</a> simultaneously.</p>
@@ -2029,15 +2017,9 @@ <h4 class="heading settled" data-level="3.2.5" id="service-worker-registration-s
       <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="attribute" data-export="" id="dom-serviceworkerregistration-scope"><code><code>scope</code></code></dfn> attribute <em>must</em> return <a data-link-type="dfn" href="#serviceworkerregistration-service-worker-registration" id="ref-for-serviceworkerregistration-service-worker-registration-2">service worker registration</a>'s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-serializer">serialized</a> <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url-6">scope url</a>.</p>
       <div class="example" id="example-2dbb4b8b"><a class="self-link" href="#example-2dbb4b8b"></a> In the example in <a href="#service-worker-url">§3.1.1 scriptURL</a>, the value of <code>registration.scope</code>, obtained from <code>navigator.serviceWorker.ready.then(registration => console.log(registration.scope))</code> for example, will be "<code>https://example.com/</code>". </div>
      </section>
-<<<<<<< HEAD
-     <section class="algorithm" data-algorithm="service-worker-registration-usecache">
-      <h4 class="heading settled" data-level="3.2.6" id="service-worker-registration-usecache"><span class="secno">3.2.6. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerregistration-usecache" id="ref-for-dom-serviceworkerregistration-usecache-2">useCache</a></code></span><a class="self-link" href="#service-worker-registration-usecache"></a></h4>
-      <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="attribute" data-export="" id="dom-serviceworkerregistration-usecache"><code><code>useCache</code></code></dfn> attribute <em>must</em> return <a data-link-type="dfn" href="#serviceworkerregistration-service-worker-registration" id="ref-for-serviceworkerregistration-service-worker-registration-3">service worker registration</a>'s <a data-link-type="dfn" href="#dfn-use-cache" id="ref-for-dfn-use-cache-1">use cache</a>.</p>
-=======
      <section class="algorithm" data-algorithm="service-worker-registration-updateviacache">
       <h4 class="heading settled" data-level="3.2.6" id="service-worker-registration-updateviacache"><span class="secno">3.2.6. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerregistration-updateviacache" id="ref-for-dom-serviceworkerregistration-updateviacache-2">updateViaCache</a></code></span><a class="self-link" href="#service-worker-registration-updateviacache"></a></h4>
-      <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="attribute" data-export="" id="dom-serviceworkerregistration-updateviacache"><code>updateViaCache</code></dfn> attribute <em>must</em> return <a data-link-type="dfn" href="#serviceworkerregistration-service-worker-registration" id="ref-for-serviceworkerregistration-service-worker-registration-3">service worker registration</a>'s <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache-1">update via cache mode</a>.</p>
->>>>>>> Changing useCache boolean to updateViaCache enum
+      <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="attribute" data-export="" id="dom-serviceworkerregistration-updateviacache"><code><code>updateViaCache</code></code></dfn> attribute <em>must</em> return <a data-link-type="dfn" href="#serviceworkerregistration-service-worker-registration" id="ref-for-serviceworkerregistration-service-worker-registration-3">service worker registration</a>'s <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache-1">update via cache mode</a>.</p>
      </section>
      <section class="algorithm" data-algorithm="service-worker-registration-update">
       <h4 class="heading settled" data-level="3.2.7" id="service-worker-registration-update"><span class="secno">3.2.7. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerregistration-update" id="ref-for-dom-serviceworkerregistration-update-2">update()</a></code></span><a class="self-link" href="#service-worker-registration-update"></a></h4>
@@ -2069,13 +2051,13 @@ <h4 class="heading settled" data-level="3.2.8" id="navigator-service-worker-unre
       <p><dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="method" data-export="" id="dom-serviceworkerregistration-unregister"><code><code>unregister()</code></code></dfn> method <em>must</em> run these steps:</p>
       <ol>
        <li data-md="">
-        <p>Let <var>p</var> be a <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects">promise</a>.</p>
+        <p>Let <var>promise</var> be a <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects">promise</a>.</p>
        <li data-md="">
-        <p>Let <var>job</var> be the result of running <a data-link-type="dfn" href="#create-job" id="ref-for-create-job-2">Create Job</a> with <em>unregister</em>, the <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url-8">scope url</a> of the <a data-link-type="dfn" href="#serviceworkerregistration-service-worker-registration" id="ref-for-serviceworkerregistration-service-worker-registration-5">service worker registration</a>, null, <var>p</var>, and the <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#context-object">context object</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#relevant-settings-object">relevant settings object</a>.</p>
+        <p>Let <var>job</var> be the result of running <a data-link-type="dfn" href="#create-job" id="ref-for-create-job-2">Create Job</a> with <em>unregister</em>, the <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url-8">scope url</a> of the <a data-link-type="dfn" href="#serviceworkerregistration-service-worker-registration" id="ref-for-serviceworkerregistration-service-worker-registration-5">service worker registration</a>, null, <var>promise</var>, and the <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#context-object">context object</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#relevant-settings-object">relevant settings object</a>.</p>
        <li data-md="">
         <p>Invoke <a data-link-type="dfn" href="#schedule-job" id="ref-for-schedule-job-2">Schedule Job</a> with <var>job</var>.</p>
        <li data-md="">
-        <p>Return <var>p</var>.</p>
+        <p>Return <var>promise</var>.</p>
       </ol>
      </section>
      <section>
@@ -2126,17 +2108,10 @@ <h3 class="heading settled" data-level="3.4" id="serviceworkercontainer-interfac
   <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/webappapis.html#eventhandler">EventHandler</a> <a class="nv idl-code" data-link-type="attribute" data-type="EventHandler" href="#dom-serviceworkercontainer-onmessageerror" id="ref-for-dom-serviceworkercontainer-onmessageerror-1">onmessageerror</a>;
 };
 </pre>
-<<<<<<< HEAD
 <pre class="idl highlight def" id="registration-option-list-dictionary"><span class="kt">dictionary</span> <dfn class="nv dfn-paneled idl-code" data-dfn-type="dictionary" data-export="" id="dictdef-registrationoptions"><code>RegistrationOptions</code></dfn> {
   <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt">USVString</span></a> <dfn class="nv dfn-paneled idl-code" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="USVString " id="dom-registrationoptions-scope"><code>scope</code></dfn>;
   <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/workers.html#workertype">WorkerType</a> <dfn class="nv dfn-paneled idl-code" data-default="&quot;classic&quot;" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="WorkerType " id="dom-registrationoptions-type"><code>type</code></dfn> = "classic";
-  <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-boolean"><span class="kt">boolean</span></a> <dfn class="nv dfn-paneled idl-code" data-default="false" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="boolean " id="dom-registrationoptions-usecache"><code>useCache</code></dfn> = <span class="kt">false</span>;
-=======
-<pre class="idl highlight def" id="registration-option-list-dictionary"><span class="kt">dictionary</span> <dfn class="nv dfn-paneled idl-code" data-dfn-type="dictionary" data-export="" id="dictdef-registrationoptions">RegistrationOptions</dfn> {
-  <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt">USVString</span></a> <dfn class="nv dfn-paneled idl-code" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="USVString " id="dom-registrationoptions-scope">scope</dfn>;
-  <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/workers.html#workertype">WorkerType</a> <dfn class="nv dfn-paneled idl-code" data-default="&quot;classic&quot;" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="WorkerType " id="dom-registrationoptions-type">type</dfn> = "classic";
-  <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache" id="ref-for-enumdef-serviceworkerupdateviacache-2">ServiceWorkerUpdateViaCache</a> <dfn class="nv dfn-paneled idl-code" data-default="&quot;imports&quot;" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="ServiceWorkerUpdateViaCache " id="dom-registrationoptions-updateviacache">updateViaCache</dfn> = "imports";
->>>>>>> Changing useCache boolean to updateViaCache enum
+  <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache" id="ref-for-enumdef-serviceworkerupdateviacache-2">ServiceWorkerUpdateViaCache</a> <dfn class="nv dfn-paneled idl-code" data-default="&quot;imports&quot;" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="ServiceWorkerUpdateViaCache " id="dom-registrationoptions-updateviacache"><code>updateViaCache</code></dfn> = "imports";
 };
 </pre>
      <p>The user agent <em>must</em> create a <code class="idl"><a data-link-type="idl" href="#serviceworkercontainer" id="ref-for-serviceworkercontainer-5">ServiceWorkerContainer</a></code> object when a <code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/webappapis.html#navigator">Navigator</a></code> object or a <code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/workers.html#workernavigator">WorkerNavigator</a></code> object is created and associate it with that object.</p>
@@ -2420,17 +2395,10 @@ <h2 class="heading settled" data-level="4" id="execution-context"><span class="s
     <div class="example" id="example-744d6b8b">
      <a class="self-link" href="#example-744d6b8b"></a> Serving Cached Resources: 
 <pre class="highlight"><span class="c1">// caching.js
-<<<<<<< HEAD
 </span>self<span class="p">.</span>addEventListener<span class="p">(</span><span class="s2">"install"</span><span class="p">,</span> event <span class="p">=></span> <span class="p">{</span>
   event<span class="p">.</span>waitUntil<span class="p">(</span>
     <span class="c1">// Open a cache of resources.
 </span>    caches<span class="p">.</span>open<span class="p">(</span><span class="s2">"shell-v1"</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span>cache <span class="p">=></span> <span class="p">{</span>
-=======
-</span>self<span class="p">.</span>addEventListener<span class="p">(</span><span class="s2">"install"</span><span class="p">,</span> event <span class="o">=</span><span class="o">></span> <span class="p">{</span>
-  event<span class="p">.</span>waitUntil<span class="p">(</span>
-    <span class="c1">// Open a cache of resources.
-</span>    caches<span class="p">.</span>open<span class="p">(</span><span class="s2">"shell-v1"</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span>cache <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
       <span class="c1">// Begins the process of fetching them.
 </span>      <span class="c1">// The coast is only clear when all the resources are ready.
 </span>      <span class="k">return</span> cache<span class="p">.</span>addAll<span class="p">(</span><span class="p">[</span>
@@ -2444,26 +2412,16 @@ <h2 class="heading settled" data-level="4" id="execution-context"><span class="s
   <span class="p">)</span><span class="p">;</span>
 <span class="p">}</span><span class="p">)</span><span class="p">;</span>
 
-<<<<<<< HEAD
 self<span class="p">.</span>addEventListener<span class="p">(</span><span class="s2">"fetch"</span><span class="p">,</span> event <span class="p">=></span> <span class="p">{</span>
-=======
-self<span class="p">.</span>addEventListener<span class="p">(</span><span class="s2">"fetch"</span><span class="p">,</span> event <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   <span class="c1">// No "fetch" events are dispatched to the service worker until it
 </span>  <span class="c1">// successfully installs and activates.
 </span>
   <span class="c1">// All operations on caches are async, including matching URLs, so we use
 </span>  <span class="c1">// promises heavily. e.respondWith() even takes promises to enable this:
 </span>  event<span class="p">.</span>respondWith<span class="p">(</span>
-<<<<<<< HEAD
     caches<span class="p">.</span>match<span class="p">(</span>e<span class="p">.</span>request<span class="p">)</span><span class="p">.</span>then<span class="p">(</span>response <span class="p">=></span> <span class="p">{</span>
       <span class="k">return</span> response <span class="o">||</span> fetch<span class="p">(</span>e<span class="p">.</span>request<span class="p">)</span><span class="p">;</span>
     <span class="p">}</span><span class="p">)</span><span class="p">.</span><span class="k">catch</span><span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="p">=></span> <span class="p">{</span>
-=======
-    caches<span class="p">.</span>match<span class="p">(</span>e<span class="p">.</span>request<span class="p">)</span><span class="p">.</span>then<span class="p">(</span>response <span class="o">=</span><span class="o">></span> <span class="p">{</span>
-      <span class="k">return</span> response <span class="o">||</span> fetch<span class="p">(</span>e<span class="p">.</span>request<span class="p">)</span><span class="p">;</span>
-    <span class="p">}</span><span class="p">)</span><span class="p">.</span><span class="k">catch</span><span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
       <span class="k">return</span> caches<span class="p">.</span>match<span class="p">(</span><span class="s2">"/fallback.html"</span><span class="p">)</span><span class="p">;</span>
     <span class="p">}</span><span class="p">)</span>
   <span class="p">)</span><span class="p">;</span>
@@ -3755,7 +3713,7 @@ <h3 class="heading settled" data-level="5.2" id="link-element-processing"><span
 <pre class="highlight">Link: &lt;/js/sw.js>; rel="serviceworker"; scope="/"
 </pre>
       <p>has more or less the same effect as a document being loaded in a secure context with the following <code>link</code> element:</p>
-<pre class="highlight"><span class="nt">&lt;link</span> <span class="na">rel=</span><span class="s">"serviceworker"</span> <span class="na">href=</span><span class="s">"/js/sw.js"</span> <span class="na">scope=</span><span class="s">"/"</span><span class="nt">></span>
+<pre class="highlight"><span class="p">&lt;</span><span class="nt">link</span> <span class="na">rel</span><span class="o">=</span><span class="s">"serviceworker"</span> <span class="na">href</span><span class="o">=</span><span class="s">"/js/sw.js"</span> <span class="na">scope</span><span class="o">=</span><span class="s">"/"</span><span class="p">></span>
 </pre>
       <p>which is more or less equivalent to the page containing JavaScript code like:</p>
 <pre class="highlight">navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/js/sw.js"</span><span class="p">,</span> <span class="p">{</span> scope<span class="o">:</span> <span class="s2">"/"</span> <span class="p">}</span><span class="p">)</span><span class="p">;</span>
@@ -3770,15 +3728,9 @@ <h3 class="heading settled" data-level="5.3" id="link-element-interface-extensio
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://html.spec.whatwg.org/multipage/scripting.html#cereactions">CEReactions</a>] <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache" id="ref-for-enumdef-serviceworkerupdateviacache-3">ServiceWorkerUpdateViaCache</a> <a class="nv idl-code" data-link-type="attribute" data-type="ServiceWorkerUpdateViaCache" href="#link-updateviacache-attribute" id="ref-for-link-updateviacache-attribute-1">updateViaCache</a>;
 };
 </pre>
-<<<<<<< HEAD
      <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="HTMLLinkElement" data-dfn-type="attribute" data-export="" id="link-scope-attribute"><code>scope</code></dfn> IDL attribute must <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-reflect">reflect</a> the element’s <dfn class="dfn-paneled" data-dfn-for="link" data-dfn-type="element-attr" data-export="" id="element-attrdef-link-scope"><code>scope</code></dfn> content attribute.</p>
      <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="HTMLLinkElement" data-dfn-type="attribute" data-export="" id="link-workertype-attribute"><code>workerType</code></dfn> IDL attribute must <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-reflect">reflect</a> the element’s <dfn class="dfn-paneled" data-dfn-for="link" data-dfn-type="element-attr" data-export="" id="element-attrdef-link-workertype"><code>workertype</code></dfn> content attribute.</p>
-     <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="HTMLLinkElement" data-dfn-type="attribute" data-export="" id="link-usecache-attribute"><code>useCache</code></dfn> IDL attribute must <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-reflect">reflect</a> the element’s <dfn class="dfn-paneled" data-dfn-for="link" data-dfn-type="element-attr" data-export="" id="element-attrdef-link-usecache"><code>usecache</code></dfn> content attribute.</p>
-=======
-     <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="HTMLLinkElement" data-dfn-type="attribute" data-export="" id="link-scope-attribute">scope</dfn> IDL attribute must <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-reflect">reflect</a> the element’s <dfn class="dfn-paneled" data-dfn-for="link" data-dfn-type="element-attr" data-export="" id="element-attrdef-link-scope">scope</dfn> content attribute.</p>
-     <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="HTMLLinkElement" data-dfn-type="attribute" data-export="" id="link-workertype-attribute">workerType</dfn> IDL attribute must <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-reflect">reflect</a> the element’s <dfn class="dfn-paneled" data-dfn-for="link" data-dfn-type="element-attr" data-export="" id="element-attrdef-link-workertype">workertype</dfn> content attribute.</p>
-     <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="HTMLLinkElement" data-dfn-type="attribute" data-export="" id="link-updateviacache-attribute">updateViaCache</dfn> IDL attribute must <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-reflect">reflect</a> the element’s <dfn class="dfn-paneled" data-dfn-for="link" data-dfn-type="element-attr" data-export="" id="element-attrdef-link-updateviacache">updateViaCache</dfn> content attribute.</p>
->>>>>>> Changing useCache boolean to updateViaCache enum
+     <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="HTMLLinkElement" data-dfn-type="attribute" data-export="" id="link-updateviacache-attribute"><code>updateViaCache</code></dfn> IDL attribute must <a data-link-type="dfn" href="https://dom.spec.whatwg.org/#concept-reflect">reflect</a> the element’s <dfn class="dfn-paneled" data-dfn-for="link" data-dfn-type="element-attr" data-export="" id="element-attrdef-link-updateviacache"><code>updateViaCache</code></dfn> content attribute.</p>
     </section>
    </section>
    <section>
@@ -4526,7 +4478,7 @@ <h4 class="heading settled" data-level="7.3.2" id="importscripts"><span class="s
           <p>Set <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-cache-mode">cache mode</a> to "<code>no-cache</code>" if any of the following are true:</p>
           <ul>
            <li data-md="">
-            <p><var>registration</var>’s <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache-2">update via cache mode</a> is "<code>never</code>".</p>
+            <p><var>registration</var>’s <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache-2">update via cache mode</a> is "<code>none</code>".</p>
            <li data-md="">
             <p>The <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#current-global-object">current global object</a>'s <a data-link-type="dfn" href="#serviceworkerglobalscope-force-bypass-cache-for-importscripts-flag" id="ref-for-serviceworkerglobalscope-force-bypass-cache-for-importscripts-flag-1">force bypass cache for importscripts flag</a> is set.</p>
            <li data-md="">
@@ -4627,7 +4579,7 @@ <h2 class="heading settled" id="algorithms"><span class="content">Appendix A: Al
      <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-2">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-scope-url">scope url</dfn> (a <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url">URL</a>).</p>
      <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-3">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-script-url">script url</dfn> (a <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url">URL</a>).</p>
      <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-4">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-worker-type">worker type</dfn> ("<code>classic</code>" or "<code>module</code>").</p>
-     <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-5">job</a> has an <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-update-via-cache-mode">update via cache mode</dfn>, which is "<code>imports</code>", "<code>all</code>", or "<code>never</code>".</p>
+     <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-5">job</a> has an <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-update-via-cache-mode">update via cache mode</dfn>, which is "<code>imports</code>", "<code>all</code>", or "<code>none</code>".</p>
      <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-6">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-client">client</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client-36">service worker client</a>). It is initially null.</p>
      <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-7">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="job-referrer">referrer</dfn> (a <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url">URL</a> or null).</p>
      <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-8">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-promise">job promise</dfn> (a <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects">promise</a>). It is initially null.</p>
@@ -6614,11 +6566,7 @@ <h3 class="heading settled" id="service-worker-script-response"><span class="con
       <a class="self-link" href="#example-bf118df6"></a> Default scope: 
 <pre class="highlight"><span class="c1">// Maximum allowed scope defaults to the path the script sits in
 </span><span class="c1">// "/js" in this example
-<<<<<<< HEAD
 </span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/js/sw.js"</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="p">=></span> <span class="p">{</span>
-=======
-</span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/js/sw.js"</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   console<span class="p">.</span>log<span class="p">(</span><span class="s2">"Install succeeded with the default scope '/js'."</span><span class="p">)</span><span class="p">;</span>
 <span class="p">}</span><span class="p">)</span><span class="p">;</span>
 </pre>
@@ -6627,11 +6575,7 @@ <h3 class="heading settled" id="service-worker-script-response"><span class="con
       <a class="self-link" href="#example-76c5aa8b"></a> Upper path without Service-Worker-Allowed header: 
 <pre class="highlight"><span class="c1">// Set the scope to an upper path of the script location
 </span><span class="c1">// Response has no Service-Worker-Allowed header
-<<<<<<< HEAD
 </span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/js/sw.js"</span><span class="p">,</span> <span class="p">{</span> scope<span class="o">:</span> <span class="s2">"/"</span> <span class="p">}</span><span class="p">)</span><span class="p">.</span><span class="k">catch</span><span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="p">=></span> <span class="p">{</span>
-=======
-</span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/js/sw.js"</span><span class="p">,</span> <span class="p">{</span> scope<span class="o">:</span> <span class="s2">"/"</span> <span class="p">}</span><span class="p">)</span><span class="p">.</span><span class="k">catch</span><span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   console<span class="p">.</span>error<span class="p">(</span><span class="s2">"Install failed due to the path restriction violation."</span><span class="p">)</span><span class="p">;</span>
 <span class="p">}</span><span class="p">)</span><span class="p">;</span>
 </pre>
@@ -6640,11 +6584,7 @@ <h3 class="heading settled" id="service-worker-script-response"><span class="con
       <a class="self-link" href="#example-49d267fe"></a> Upper path with Service-Worker-Allowed header: 
 <pre class="highlight"><span class="c1">// Set the scope to an upper path of the script location
 </span><span class="c1">// Response included "Service-Worker-Allowed : /"
-<<<<<<< HEAD
 </span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/js/sw.js"</span><span class="p">,</span> <span class="p">{</span> scope<span class="o">:</span> <span class="s2">"/"</span> <span class="p">}</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="p">=></span> <span class="p">{</span>
-=======
-</span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/js/sw.js"</span><span class="p">,</span> <span class="p">{</span> scope<span class="o">:</span> <span class="s2">"/"</span> <span class="p">}</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   console<span class="p">.</span>log<span class="p">(</span><span class="s2">"Install succeeded as the max allowed scope was overriden to '/'."</span><span class="p">)</span><span class="p">;</span>
 <span class="p">}</span><span class="p">)</span><span class="p">;</span>
 </pre>
@@ -6653,11 +6593,7 @@ <h3 class="heading settled" id="service-worker-script-response"><span class="con
       <a class="self-link" href="#example-7a18b25f"></a> A path restriction voliation even with Service-Worker-Allowed header: 
 <pre class="highlight"><span class="c1">// Set the scope to an upper path of the script location
 </span><span class="c1">// Response included "Service-Worker-Allowed : /foo"
-<<<<<<< HEAD
 </span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/foo/bar/sw.js"</span><span class="p">,</span> <span class="p">{</span> scope<span class="o">:</span> <span class="s2">"/"</span> <span class="p">}</span><span class="p">)</span><span class="p">.</span><span class="k">catch</span><span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="p">=></span> <span class="p">{</span>
-=======
-</span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/foo/bar/sw.js"</span><span class="p">,</span> <span class="p">{</span> scope<span class="o">:</span> <span class="s2">"/"</span> <span class="p">}</span><span class="p">)</span><span class="p">.</span><span class="k">catch</span><span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   console<span class="p">.</span>error<span class="p">(</span><span class="s2">"Install failed as the scope is still out of the overriden maximum allowed scope."</span><span class="p">)</span><span class="p">;</span>
 <span class="p">}</span><span class="p">)</span><span class="p">;</span>
 </pre>
@@ -7452,7 +7388,7 @@ <h3 class="no-num no-ref heading settled" id="index-defined-elsewhere"><span cla
      <li><a href="https://infra.spec.whatwg.org/#ascii-case-insensitive">ascii case-insensitive</a>
      <li><a href="https://infra.spec.whatwg.org/#byte-sequence">byte sequence</a>
      <li><a href="https://infra.spec.whatwg.org/#list-contain">contain</a>
-     <li><a href="https://infra.spec.whatwg.org/#map-exists">exists</a>
+     <li><a href="https://infra.spec.whatwg.org/#map-exists">exist</a>
      <li><a href="https://infra.spec.whatwg.org/#map-iterate">for each</a>
      <li><a href="https://infra.spec.whatwg.org/#map-getting-the-keys">get the keys</a>
      <li><a href="https://infra.spec.whatwg.org/#list-item">item</a>
@@ -7628,13 +7564,8 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="#serviceworker"><span class="n">ServiceWorker</span></a>? <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorker?" href="#dom-serviceworkerregistration-active"><span class="nv">active</span></a>;
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SameObject"><span class="nv">SameObject</span></a>] <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="#navigationpreloadmanager"><span class="n">NavigationPreloadManager</span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="NavigationPreloadManager" href="#dom-serviceworkerregistration-navigationpreload"><span class="nv">navigationPreload</span></a>;
 
-<<<<<<< HEAD
   <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt"><span class="kt">USVString</span></span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="USVString" href="#dom-serviceworkerregistration-scope"><span class="nv">scope</span></a>;
-  <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-boolean"><span class="kt"><span class="kt">boolean</span></span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="boolean" href="#dom-serviceworkerregistration-usecache"><span class="nv">useCache</span></a>;
-=======
-  <span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt">USVString</span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="USVString" href="#dom-serviceworkerregistration-scope">scope</a>;
-  <span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache">ServiceWorkerUpdateViaCache</a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorkerUpdateViaCache" href="#dom-serviceworkerregistration-updateviacache">updateViaCache</a>;
->>>>>>> Changing useCache boolean to updateViaCache enum
+  <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache"><span class="n">ServiceWorkerUpdateViaCache</span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorkerUpdateViaCache" href="#dom-serviceworkerregistration-updateviacache"><span class="nv">updateViaCache</span></a>;
 
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <span class="kt"><span class="kt">Promise</span></span>&lt;<span class="kt"><span class="kt">void</span></span>> <a class="nv idl-code" data-link-type="method" href="#dom-serviceworkerregistration-update"><span class="nv">update</span></a>();
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <span class="kt"><span class="kt">Promise</span></span>&lt;<a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-boolean"><span class="kt"><span class="kt">boolean</span></span></a>> <a class="nv idl-code" data-link-type="method" href="#dom-serviceworkerregistration-unregister"><span class="nv">unregister</span></a>();
@@ -7643,19 +7574,14 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/webappapis.html#eventhandler"><span class="n">EventHandler</span></a> <a class="nv idl-code" data-link-type="attribute" data-type="EventHandler" href="#dom-serviceworkerregistration-onupdatefound"><span class="nv">onupdatefound</span></a>;
 };
 
-<<<<<<< HEAD
-<span class="kt"><span class="kt">partial</span></span> <span class="kt"><span class="kt">interface</span></span> <a class="nv idl-code" data-link-type="interface" href="https://html.spec.whatwg.org/multipage/webappapis.html#navigator"><span class="nv">Navigator</span></a> {
-  [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SecureContext"><span class="nv">SecureContext</span></a>, <a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SameObject"><span class="nv">SameObject</span></a>] <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="#serviceworkercontainer"><span class="n">ServiceWorkerContainer</span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorkerContainer" href="#navigator-service-worker-attribute"><span class="nv">serviceWorker</span></a>;
-=======
-<span class="kt">enum</span> <a class="nv" href="#enumdef-serviceworkerupdateviacache">ServiceWorkerUpdateViaCache</a> {
-  <a class="s" href="#dom-serviceworkerupdateviacache-imports">"imports"</a>,
-  <a class="s" href="#dom-serviceworkerupdateviacache-all">"all"</a>,
-  <a class="s" href="#dom-serviceworkerupdateviacache-none">"none"</a>
+<span class="kt"><span class="kt">enum</span></span> <a class="nv" href="#enumdef-serviceworkerupdateviacache"><code><span class="nv">ServiceWorkerUpdateViaCache</span></code></a> {
+  <a class="s" href="#dom-serviceworkerupdateviacache-imports"><code><span class="s">"imports"</span></code></a>,
+  <a class="s" href="#dom-serviceworkerupdateviacache-all"><code><span class="s">"all"</span></code></a>,
+  <a class="s" href="#dom-serviceworkerupdateviacache-none"><code><span class="s">"none"</span></code></a>
 };
 
-<span class="kt">partial</span> <span class="kt">interface</span> <a class="nv idl-code" data-link-type="interface" href="https://html.spec.whatwg.org/multipage/webappapis.html#navigator">Navigator</a> {
-  [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SecureContext">SecureContext</a>, <a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SameObject">SameObject</a>] <span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="#serviceworkercontainer">ServiceWorkerContainer</a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorkerContainer" href="#navigator-service-worker-attribute">serviceWorker</a>;
->>>>>>> Changing useCache boolean to updateViaCache enum
+<span class="kt"><span class="kt">partial</span></span> <span class="kt"><span class="kt">interface</span></span> <a class="nv idl-code" data-link-type="interface" href="https://html.spec.whatwg.org/multipage/webappapis.html#navigator"><span class="nv">Navigator</span></a> {
+  [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SecureContext"><span class="nv">SecureContext</span></a>, <a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SameObject"><span class="nv">SameObject</span></a>] <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="#serviceworkercontainer"><span class="n">ServiceWorkerContainer</span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorkerContainer" href="#navigator-service-worker-attribute"><span class="nv">serviceWorker</span></a>;
 };
 
 <span class="kt"><span class="kt">partial</span></span> <span class="kt"><span class="kt">interface</span></span> <a class="nv idl-code" data-link-type="interface" href="https://html.spec.whatwg.org/multipage/workers.html#workernavigator"><span class="nv">WorkerNavigator</span></a> {
@@ -7681,17 +7607,10 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/webappapis.html#eventhandler"><span class="n">EventHandler</span></a> <a class="nv idl-code" data-link-type="attribute" data-type="EventHandler" href="#dom-serviceworkercontainer-onmessageerror"><span class="nv">onmessageerror</span></a>;
 };
 
-<<<<<<< HEAD
 <span class="kt"><span class="kt">dictionary</span></span> <a class="nv" href="#dictdef-registrationoptions"><code><span class="nv">RegistrationOptions</span></code></a> {
   <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt"><span class="kt">USVString</span></span></a> <a class="nv" data-type="USVString " href="#dom-registrationoptions-scope"><code><span class="nv">scope</span></code></a>;
   <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/workers.html#workertype"><span class="n">WorkerType</span></a> <a class="nv" data-default="&quot;classic&quot;" data-type="WorkerType " href="#dom-registrationoptions-type"><code><span class="nv">type</span></code></a> = "classic";
-  <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-boolean"><span class="kt"><span class="kt">boolean</span></span></a> <a class="nv" data-default="false" data-type="boolean " href="#dom-registrationoptions-usecache"><code><span class="nv">useCache</span></code></a> = <span class="kt"><span class="kt">false</span></span>;
-=======
-<span class="kt">dictionary</span> <a class="nv" href="#dictdef-registrationoptions">RegistrationOptions</a> {
-  <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt">USVString</span></a> <a class="nv" data-type="USVString " href="#dom-registrationoptions-scope">scope</a>;
-  <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/workers.html#workertype">WorkerType</a> <a class="nv" data-default="&quot;classic&quot;" data-type="WorkerType " href="#dom-registrationoptions-type">type</a> = "classic";
-  <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache">ServiceWorkerUpdateViaCache</a> <a class="nv" data-default="&quot;imports&quot;" data-type="ServiceWorkerUpdateViaCache " href="#dom-registrationoptions-updateviacache">updateViaCache</a> = "imports";
->>>>>>> Changing useCache boolean to updateViaCache enum
+  <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache"><span class="n">ServiceWorkerUpdateViaCache</span></a> <a class="nv" data-default="&quot;imports&quot;" data-type="ServiceWorkerUpdateViaCache " href="#dom-registrationoptions-updateviacache"><code><span class="nv">updateViaCache</span></code></a> = "imports";
 };
 
 [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SecureContext"><span class="nv">SecureContext</span></a>, <a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#Exposed"><span class="nv">Exposed</span></a>=(<span class="n"><span class="n">Window</span></span>,<span class="n"><span class="n">Worker</span></span>)]
@@ -7838,17 +7757,10 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   <span class="kt"><span class="kt">sequence</span></span>&lt;<a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/comms.html#messageport"><span class="n">MessagePort</span></a>> <a class="nv" data-default="None" data-type="sequence<MessagePort> " href="#dom-extendablemessageeventinit-ports"><code><span class="nv">ports</span></code></a> = [];
 };
 
-<<<<<<< HEAD
 <span class="kt"><span class="kt">partial</span></span> <span class="kt"><span class="kt">interface</span></span> <a class="nv idl-code" data-link-type="interface" href="https://html.spec.whatwg.org/multipage/semantics.html#htmllinkelement"><span class="nv">HTMLLinkElement</span></a> {
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://html.spec.whatwg.org/multipage/scripting.html#cereactions"><span class="nv">CEReactions</span></a>] <span class="kt"><span class="kt">attribute</span></span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt"><span class="kt">USVString</span></span></a> <a class="nv idl-code" data-link-type="attribute" data-type="USVString" href="#link-scope-attribute"><span class="nv">scope</span></a>;
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://html.spec.whatwg.org/multipage/scripting.html#cereactions"><span class="nv">CEReactions</span></a>] <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/workers.html#workertype"><span class="n">WorkerType</span></a> <a class="nv idl-code" data-link-type="attribute" data-type="WorkerType" href="#link-workertype-attribute"><span class="nv">workerType</span></a>;
-  [<a class="nv idl-code" data-link-type="extended-attribute" href="https://html.spec.whatwg.org/multipage/scripting.html#cereactions"><span class="nv">CEReactions</span></a>] <span class="kt"><span class="kt">attribute</span></span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-boolean"><span class="kt"><span class="kt">boolean</span></span></a> <a class="nv idl-code" data-link-type="attribute" data-type="boolean" href="#link-usecache-attribute"><span class="nv">useCache</span></a>;
-=======
-<span class="kt">partial</span> <span class="kt">interface</span> <a class="nv idl-code" data-link-type="interface" href="https://html.spec.whatwg.org/multipage/semantics.html#htmllinkelement">HTMLLinkElement</a> {
-  [<a class="nv idl-code" data-link-type="extended-attribute" href="https://html.spec.whatwg.org/multipage/scripting.html#cereactions">CEReactions</a>] <span class="kt">attribute</span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt">USVString</span></a> <a class="nv idl-code" data-link-type="attribute" data-type="USVString" href="#link-scope-attribute">scope</a>;
-  [<a class="nv idl-code" data-link-type="extended-attribute" href="https://html.spec.whatwg.org/multipage/scripting.html#cereactions">CEReactions</a>] <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/workers.html#workertype">WorkerType</a> <a class="nv idl-code" data-link-type="attribute" data-type="WorkerType" href="#link-workertype-attribute">workerType</a>;
-  [<a class="nv idl-code" data-link-type="extended-attribute" href="https://html.spec.whatwg.org/multipage/scripting.html#cereactions">CEReactions</a>] <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache">ServiceWorkerUpdateViaCache</a> <a class="nv idl-code" data-link-type="attribute" data-type="ServiceWorkerUpdateViaCache" href="#link-updateviacache-attribute">updateViaCache</a>;
->>>>>>> Changing useCache boolean to updateViaCache enum
+  [<a class="nv idl-code" data-link-type="extended-attribute" href="https://html.spec.whatwg.org/multipage/scripting.html#cereactions"><span class="nv">CEReactions</span></a>] <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache"><span class="n">ServiceWorkerUpdateViaCache</span></a> <a class="nv idl-code" data-link-type="attribute" data-type="ServiceWorkerUpdateViaCache" href="#link-updateviacache-attribute"><span class="nv">updateViaCache</span></a>;
 };
 
 <span class="kt"><span class="kt">partial</span></span> <span class="kt"><span class="kt">interface</span></span> <a class="nv idl-code" data-link-type="interface" href="https://html.spec.whatwg.org/multipage/webappapis.html#windoworworkerglobalscope"><span class="nv">WindowOrWorkerGlobalScope</span></a> {
diff --git a/docs/v1/index.bs b/docs/v1/index.bs
index f79ee896..b3df5190 100644
--- a/docs/v1/index.bs
+++ b/docs/v1/index.bs
@@ -191,7 +191,7 @@ spec: webappsec-referrer-policy; urlPrefix: https://w3c.github.io/webappsec-refe
 
     A [=/service worker registration=] has an associated <dfn export id="dfn-last-update-check-time">last update check time</dfn>. It is initially set to null.
 
-    A [=/service worker registration=] has an associated <dfn export id="dfn-update-via-cache">update via cache mode</dfn>, which is "`imports`", "`all`", or "`never`". It is initially set to "`imports`".
+    A [=/service worker registration=] has an associated <dfn export id="dfn-update-via-cache">update via cache mode</dfn>, which is "`imports`", "`all`", or "`none`". It is initially set to "`imports`".
 
     A [=/service worker registration=] has an associated <dfn export id="dfn-uninstalling-flag">uninstalling flag</dfn>. It is initially unset.
 
@@ -1957,7 +1957,7 @@ spec: webappsec-referrer-policy; urlPrefix: https://w3c.github.io/webappsec-refe
             1. Let |registration| be |serviceWorker|'s [=containing service worker registration=].
             1. Set |request|'s [=service-workers mode=] to "`foreign`".
             1. Set |request|'s [=request/cache mode=] to "<code>no-cache</code>" if any of the following are true:
-                * |registration|'s [=service worker registration/update via cache mode=] is "`never`".
+                * |registration|'s [=service worker registration/update via cache mode=] is "`none`".
                 * The [=current global object=]'s [=force bypass cache for importscripts flag=] is set.
                 * |registration|'s [=last update check time=] is not null and the time difference in seconds calculated by the current time minus |registration|’s [=last update check time=] is greater than 86400.
             1. Let |response| be the result of <a lt="fetch">fetching</a> |request|.
@@ -2073,7 +2073,7 @@ spec: webappsec-referrer-policy; urlPrefix: https://w3c.github.io/webappsec-refe
 
     A <a>job</a> has a <dfn id="dfn-job-worker-type">worker type</dfn> ("<code>classic</code>" or "<code>module</code>").
 
-    A <a>job</a> has an <dfn id="dfn-job-update-via-cache-mode">update via cache mode</dfn>, which is "`imports`", "`all`", or "`never`".
+    A <a>job</a> has an <dfn id="dfn-job-update-via-cache-mode">update via cache mode</dfn>, which is "`imports`", "`all`", or "`none`".
 
     A <a>job</a> has a <dfn id="dfn-job-client">client</dfn> (a [=/service worker client=]). It is initially null.
 
diff --git a/docs/v1/index.html b/docs/v1/index.html
index 17df7459..b8757034 100644
--- a/docs/v1/index.html
+++ b/docs/v1/index.html
@@ -1177,11 +1177,7 @@
 		}
 	}
 </style>
-<<<<<<< HEAD
-  <meta content="Bikeshed version 5eac41affc3976771f238ed8f80db1c877b65b40" name="generator">
-=======
-  <meta content="Bikeshed version 588c13f032a881310dc4886e2269c4ffd3b6784b" name="generator">
->>>>>>> Changing useCache boolean to updateViaCache enum
+  <meta content="Bikeshed version 34209db86579ed3f0e75afb470f2788a2646155f" name="generator">
   <link href="https://www.w3.org/TR/service-workers/" rel="canonical">
 <style>/* style-md-lists */
 
@@ -1429,7 +1425,7 @@
   <div class="head">
    <p data-fill-with="logo"><a class="logo" href="https://www.w3.org/"> <img alt="W3C" height="48" src="https://www.w3.org/StyleSheets/TR/2016/logos/W3C" width="72"> </a> </p>
    <h1 class="p-name no-ref" id="title">Service Workers 1</h1>
-   <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft, <time class="dt-updated" datetime="2017-05-30">30 May 2017</time></span></h2>
+   <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft, <time class="dt-updated" datetime="2017-06-05">5 June 2017</time></span></h2>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
@@ -1768,7 +1764,7 @@ <h3 class="heading settled" data-level="2.2" id="service-worker-registration-con
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-8">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-waiting-worker">waiting worker</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker-33">service worker</a> or null) whose <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state-2">state</a> is <em>installed</em>. It is initially set to null.</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-9">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-active-worker">active worker</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker" id="ref-for-dfn-service-worker-34">service worker</a> or null) whose <a data-link-type="dfn" href="#dfn-state" id="ref-for-dfn-state-3">state</a> is either <em>activating</em> or <em>activated</em>. It is initially set to null.</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-10">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-last-update-check-time">last update check time</dfn>. It is initially set to null.</p>
-     <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-11">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-update-via-cache">update via cache mode</dfn>, which is "<code>imports</code>", "<code>all</code>", or "<code>never</code>". It is initially set to "<code>imports</code>".</p>
+     <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-11">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-update-via-cache">update via cache mode</dfn>, which is "<code>imports</code>", "<code>all</code>", or "<code>none</code>". It is initially set to "<code>imports</code>".</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-12">service worker registration</a> has an associated <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-uninstalling-flag">uninstalling flag</dfn>. It is initially unset.</p>
      <p>A <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-13">service worker registration</a> has one or more <dfn class="dfn-paneled" data-dfn-for="service worker registration" data-dfn-type="dfn" data-export="" id="dfn-service-worker-registration-task-queue">task queues</dfn> that back up the <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-task">tasks</a> from its <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker-2">active worker</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop">event loop</a>’s corresponding <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-queue">task queues</a>. (The target task sources for this back up operation are the <a data-link-type="dfn" href="#dfn-handle-fetch-task-source" id="ref-for-dfn-handle-fetch-task-source-1">handle fetch task source</a> and the <a data-link-type="dfn" href="#dfn-handle-functional-event-task-source" id="ref-for-dfn-handle-functional-event-task-source-1">handle functional event task source</a>.) The user agent dumps the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker-3">active worker</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#concept-task">tasks</a> to the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-14">service worker registration</a>'s <a data-link-type="dfn" href="#dfn-service-worker-registration-task-queue" id="ref-for-dfn-service-worker-registration-task-queue-1">task queues</a> when the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker-4">active worker</a> is <a data-link-type="dfn" href="#terminate-service-worker" id="ref-for-terminate-service-worker-2">terminated</a> and <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#queue-a-task">re-queues those tasks</a> to the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker-5">active worker</a>’s <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop">event loop</a>’s corresponding <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-queue">task queues</a> when the <a data-link-type="dfn" href="#dfn-active-worker" id="ref-for-dfn-active-worker-6">active worker</a> spins off. Unlike the <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#task-queue">task queues</a> owned by <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop">event loops</a>, the <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-15">service worker registration</a>'s <a data-link-type="dfn" href="#dfn-service-worker-registration-task-queue" id="ref-for-dfn-service-worker-registration-task-queue-2">task queues</a> are not processed by any <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#event-loop">event loops</a> in and of itself.</p>
      <section>
@@ -1823,20 +1819,12 @@ <h2 class="heading settled" data-level="3" id="document-context"><span class="se
      <a class="self-link" href="#example-7e94092e"></a> Bootstrapping with a service worker: 
 <pre class="highlight"><span class="c1">// scope defaults to the path the script sits in
 </span><span class="c1">// "/" in this example
-<<<<<<< HEAD
 </span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/serviceworker.js"</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span>registration <span class="p">=></span> <span class="p">{</span>
-=======
-</span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/serviceworker.js"</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span>registration <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   console<span class="p">.</span>log<span class="p">(</span><span class="s2">"success!"</span><span class="p">)</span><span class="p">;</span>
   <span class="k">if</span> <span class="p">(</span>registration<span class="p">.</span>installing<span class="p">)</span> <span class="p">{</span>
     registration<span class="p">.</span>installing<span class="p">.</span>postMessage<span class="p">(</span><span class="s2">"Howdy from your installing page."</span><span class="p">)</span><span class="p">;</span>
   <span class="p">}</span>
-<<<<<<< HEAD
 <span class="p">}</span><span class="p">,</span> err <span class="p">=></span> <span class="p">{</span>
-=======
-<span class="p">}</span><span class="p">,</span> err <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   console<span class="p">.</span>error<span class="p">(</span><span class="s2">"Installing the worker failed!"</span><span class="p">,</span> err<span class="p">)</span><span class="p">;</span>
 <span class="p">}</span><span class="p">)</span><span class="p">;</span>
 </pre>
@@ -1959,10 +1947,10 @@ <h3 class="heading settled" data-level="3.2" id="serviceworkerregistration-inter
   <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/webappapis.html#eventhandler">EventHandler</a> <a class="nv idl-code" data-link-type="attribute" data-type="EventHandler" href="#dom-serviceworkerregistration-onupdatefound" id="ref-for-dom-serviceworkerregistration-onupdatefound-1">onupdatefound</a>;
 };
 
-<span class="kt">enum</span> <dfn class="nv dfn-paneled idl-code" data-dfn-type="enum" data-export="" id="enumdef-serviceworkerupdateviacache">ServiceWorkerUpdateViaCache</dfn> {
-  <dfn class="s idl-code" data-dfn-for="ServiceWorkerUpdateViaCache" data-dfn-type="enum-value" data-export="" data-lt="&quot;imports&quot;|imports" id="dom-serviceworkerupdateviacache-imports">"imports"<a class="self-link" href="#dom-serviceworkerupdateviacache-imports"></a></dfn>,
-  <dfn class="s idl-code" data-dfn-for="ServiceWorkerUpdateViaCache" data-dfn-type="enum-value" data-export="" data-lt="&quot;all&quot;|all" id="dom-serviceworkerupdateviacache-all">"all"<a class="self-link" href="#dom-serviceworkerupdateviacache-all"></a></dfn>,
-  <dfn class="s idl-code" data-dfn-for="ServiceWorkerUpdateViaCache" data-dfn-type="enum-value" data-export="" data-lt="&quot;none&quot;|none" id="dom-serviceworkerupdateviacache-none">"none"<a class="self-link" href="#dom-serviceworkerupdateviacache-none"></a></dfn>
+<span class="kt">enum</span> <dfn class="nv dfn-paneled idl-code" data-dfn-type="enum" data-export="" id="enumdef-serviceworkerupdateviacache"><code>ServiceWorkerUpdateViaCache</code></dfn> {
+  <dfn class="s idl-code" data-dfn-for="ServiceWorkerUpdateViaCache" data-dfn-type="enum-value" data-export="" data-lt="&quot;imports&quot;|imports" id="dom-serviceworkerupdateviacache-imports"><code>"imports"</code><a class="self-link" href="#dom-serviceworkerupdateviacache-imports"></a></dfn>,
+  <dfn class="s idl-code" data-dfn-for="ServiceWorkerUpdateViaCache" data-dfn-type="enum-value" data-export="" data-lt="&quot;all&quot;|all" id="dom-serviceworkerupdateviacache-all"><code>"all"</code><a class="self-link" href="#dom-serviceworkerupdateviacache-all"></a></dfn>,
+  <dfn class="s idl-code" data-dfn-for="ServiceWorkerUpdateViaCache" data-dfn-type="enum-value" data-export="" data-lt="&quot;none&quot;|none" id="dom-serviceworkerupdateviacache-none"><code>"none"</code><a class="self-link" href="#dom-serviceworkerupdateviacache-none"></a></dfn>
 };
 </pre>
      <p>A <code class="idl"><a data-link-type="idl" href="#serviceworkerregistration" id="ref-for-serviceworkerregistration-3">ServiceWorkerRegistration</a></code> object represents a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-31">service worker registration</a>. Each <code class="idl"><a data-link-type="idl" href="#serviceworkerregistration" id="ref-for-serviceworkerregistration-4">ServiceWorkerRegistration</a></code> object is associated with a <dfn class="dfn-paneled" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="dfn" data-noexport="" id="serviceworkerregistration-service-worker-registration">service worker registration</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-32">service worker registration</a>). Multiple separate objects implementing the <code class="idl"><a data-link-type="idl" href="#serviceworkerregistration" id="ref-for-serviceworkerregistration-5">ServiceWorkerRegistration</a></code> interface across documents and workers can all be associated with the same <a data-link-type="dfn" href="#dfn-service-worker-registration" id="ref-for-dfn-service-worker-registration-33">service worker registration</a> simultaneously.</p>
@@ -1986,15 +1974,9 @@ <h4 class="heading settled" data-level="3.2.4" id="service-worker-registration-s
       <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="attribute" data-export="" id="dom-serviceworkerregistration-scope"><code><code>scope</code></code></dfn> attribute <em>must</em> return <a data-link-type="dfn" href="#serviceworkerregistration-service-worker-registration" id="ref-for-serviceworkerregistration-service-worker-registration-1">service worker registration</a>'s <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url-serializer">serialized</a> <a data-link-type="dfn" href="#dfn-scope-url" id="ref-for-dfn-scope-url-6">scope url</a>.</p>
       <div class="example" id="example-2dbb4b8b"><a class="self-link" href="#example-2dbb4b8b"></a> In the example in <a href="#service-worker-url">§3.1.1 scriptURL</a>, the value of <code>registration.scope</code>, obtained from <code>navigator.serviceWorker.ready.then(registration => console.log(registration.scope))</code> for example, will be "<code>https://example.com/</code>". </div>
      </section>
-<<<<<<< HEAD
-     <section class="algorithm" data-algorithm="service-worker-registration-usecache">
-      <h4 class="heading settled" data-level="3.2.5" id="service-worker-registration-usecache"><span class="secno">3.2.5. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerregistration-usecache" id="ref-for-dom-serviceworkerregistration-usecache-2">useCache</a></code></span><a class="self-link" href="#service-worker-registration-usecache"></a></h4>
-      <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="attribute" data-export="" id="dom-serviceworkerregistration-usecache"><code><code>useCache</code></code></dfn> attribute <em>must</em> return <a data-link-type="dfn" href="#serviceworkerregistration-service-worker-registration" id="ref-for-serviceworkerregistration-service-worker-registration-2">service worker registration</a>'s <a data-link-type="dfn" href="#dfn-use-cache" id="ref-for-dfn-use-cache-1">use cache</a>.</p>
-=======
      <section class="algorithm" data-algorithm="service-worker-registration-updateviacache">
       <h4 class="heading settled" data-level="3.2.5" id="service-worker-registration-updateviacache"><span class="secno">3.2.5. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerregistration-updateviacache" id="ref-for-dom-serviceworkerregistration-updateviacache-2">updateViaCache</a></code></span><a class="self-link" href="#service-worker-registration-updateviacache"></a></h4>
-      <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="attribute" data-export="" id="dom-serviceworkerregistration-updateviacache"><code>updateViaCache</code></dfn> attribute <em>must</em> return <a data-link-type="dfn" href="#serviceworkerregistration-service-worker-registration" id="ref-for-serviceworkerregistration-service-worker-registration-2">service worker registration</a>'s <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache-1">update via cache mode</a>.</p>
->>>>>>> Changing useCache boolean to updateViaCache enum
+      <p>The <dfn class="dfn-paneled idl-code" data-dfn-for="ServiceWorkerRegistration" data-dfn-type="attribute" data-export="" id="dom-serviceworkerregistration-updateviacache"><code><code>updateViaCache</code></code></dfn> attribute <em>must</em> return <a data-link-type="dfn" href="#serviceworkerregistration-service-worker-registration" id="ref-for-serviceworkerregistration-service-worker-registration-2">service worker registration</a>'s <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache-1">update via cache mode</a>.</p>
      </section>
      <section class="algorithm" data-algorithm="service-worker-registration-update">
       <h4 class="heading settled" data-level="3.2.6" id="service-worker-registration-update"><span class="secno">3.2.6. </span><span class="content"><code class="idl"><a data-link-type="idl" href="#dom-serviceworkerregistration-update" id="ref-for-dom-serviceworkerregistration-update-2">update()</a></code></span><a class="self-link" href="#service-worker-registration-update"></a></h4>
@@ -2083,17 +2065,10 @@ <h3 class="heading settled" data-level="3.4" id="serviceworkercontainer-interfac
   <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/webappapis.html#eventhandler">EventHandler</a> <a class="nv idl-code" data-link-type="attribute" data-type="EventHandler" href="#dom-serviceworkercontainer-onmessageerror" id="ref-for-dom-serviceworkercontainer-onmessageerror-1">onmessageerror</a>;
 };
 </pre>
-<<<<<<< HEAD
 <pre class="idl highlight def" id="registration-option-list-dictionary"><span class="kt">dictionary</span> <dfn class="nv dfn-paneled idl-code" data-dfn-type="dictionary" data-export="" id="dictdef-registrationoptions"><code>RegistrationOptions</code></dfn> {
   <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt">USVString</span></a> <dfn class="nv dfn-paneled idl-code" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="USVString " id="dom-registrationoptions-scope"><code>scope</code></dfn>;
   <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/workers.html#workertype">WorkerType</a> <dfn class="nv dfn-paneled idl-code" data-default="&quot;classic&quot;" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="WorkerType " id="dom-registrationoptions-type"><code>type</code></dfn> = "classic";
-  <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-boolean"><span class="kt">boolean</span></a> <dfn class="nv dfn-paneled idl-code" data-default="false" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="boolean " id="dom-registrationoptions-usecache"><code>useCache</code></dfn> = <span class="kt">false</span>;
-=======
-<pre class="idl highlight def" id="registration-option-list-dictionary"><span class="kt">dictionary</span> <dfn class="nv dfn-paneled idl-code" data-dfn-type="dictionary" data-export="" id="dictdef-registrationoptions">RegistrationOptions</dfn> {
-  <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt">USVString</span></a> <dfn class="nv dfn-paneled idl-code" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="USVString " id="dom-registrationoptions-scope">scope</dfn>;
-  <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/workers.html#workertype">WorkerType</a> <dfn class="nv dfn-paneled idl-code" data-default="&quot;classic&quot;" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="WorkerType " id="dom-registrationoptions-type">type</dfn> = "classic";
-  <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache" id="ref-for-enumdef-serviceworkerupdateviacache-2">ServiceWorkerUpdateViaCache</a> <dfn class="nv dfn-paneled idl-code" data-default="&quot;imports&quot;" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="ServiceWorkerUpdateViaCache " id="dom-registrationoptions-updateviacache">updateViaCache</dfn> = "imports";
->>>>>>> Changing useCache boolean to updateViaCache enum
+  <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache" id="ref-for-enumdef-serviceworkerupdateviacache-2">ServiceWorkerUpdateViaCache</a> <dfn class="nv dfn-paneled idl-code" data-default="&quot;imports&quot;" data-dfn-for="RegistrationOptions" data-dfn-type="dict-member" data-export="" data-type="ServiceWorkerUpdateViaCache " id="dom-registrationoptions-updateviacache"><code>updateViaCache</code></dfn> = "imports";
 };
 </pre>
      <p>The user agent <em>must</em> create a <code class="idl"><a data-link-type="idl" href="#serviceworkercontainer" id="ref-for-serviceworkercontainer-5">ServiceWorkerContainer</a></code> object when a <code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/webappapis.html#navigator">Navigator</a></code> object or a <code class="idl"><a data-link-type="idl" href="https://html.spec.whatwg.org/multipage/workers.html#workernavigator">WorkerNavigator</a></code> object is created and associate it with that object.</p>
@@ -2324,17 +2299,10 @@ <h2 class="heading settled" data-level="4" id="execution-context"><span class="s
     <div class="example" id="example-744d6b8b">
      <a class="self-link" href="#example-744d6b8b"></a> Serving Cached Resources: 
 <pre class="highlight"><span class="c1">// caching.js
-<<<<<<< HEAD
 </span>self<span class="p">.</span>addEventListener<span class="p">(</span><span class="s2">"install"</span><span class="p">,</span> event <span class="p">=></span> <span class="p">{</span>
   event<span class="p">.</span>waitUntil<span class="p">(</span>
     <span class="c1">// Open a cache of resources.
 </span>    caches<span class="p">.</span>open<span class="p">(</span><span class="s2">"shell-v1"</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span>cache <span class="p">=></span> <span class="p">{</span>
-=======
-</span>self<span class="p">.</span>addEventListener<span class="p">(</span><span class="s2">"install"</span><span class="p">,</span> event <span class="o">=</span><span class="o">></span> <span class="p">{</span>
-  event<span class="p">.</span>waitUntil<span class="p">(</span>
-    <span class="c1">// Open a cache of resources.
-</span>    caches<span class="p">.</span>open<span class="p">(</span><span class="s2">"shell-v1"</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span>cache <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
       <span class="c1">// Begins the process of fetching them.
 </span>      <span class="c1">// The coast is only clear when all the resources are ready.
 </span>      <span class="k">return</span> cache<span class="p">.</span>addAll<span class="p">(</span><span class="p">[</span>
@@ -2348,26 +2316,16 @@ <h2 class="heading settled" data-level="4" id="execution-context"><span class="s
   <span class="p">)</span><span class="p">;</span>
 <span class="p">}</span><span class="p">)</span><span class="p">;</span>
 
-<<<<<<< HEAD
 self<span class="p">.</span>addEventListener<span class="p">(</span><span class="s2">"fetch"</span><span class="p">,</span> event <span class="p">=></span> <span class="p">{</span>
-=======
-self<span class="p">.</span>addEventListener<span class="p">(</span><span class="s2">"fetch"</span><span class="p">,</span> event <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   <span class="c1">// No "fetch" events are dispatched to the service worker until it
 </span>  <span class="c1">// successfully installs and activates.
 </span>
   <span class="c1">// All operations on caches are async, including matching URLs, so we use
 </span>  <span class="c1">// promises heavily. e.respondWith() even takes promises to enable this:
 </span>  event<span class="p">.</span>respondWith<span class="p">(</span>
-<<<<<<< HEAD
     caches<span class="p">.</span>match<span class="p">(</span>e<span class="p">.</span>request<span class="p">)</span><span class="p">.</span>then<span class="p">(</span>response <span class="p">=></span> <span class="p">{</span>
       <span class="k">return</span> response <span class="o">||</span> fetch<span class="p">(</span>e<span class="p">.</span>request<span class="p">)</span><span class="p">;</span>
     <span class="p">}</span><span class="p">)</span><span class="p">.</span><span class="k">catch</span><span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="p">=></span> <span class="p">{</span>
-=======
-    caches<span class="p">.</span>match<span class="p">(</span>e<span class="p">.</span>request<span class="p">)</span><span class="p">.</span>then<span class="p">(</span>response <span class="o">=</span><span class="o">></span> <span class="p">{</span>
-      <span class="k">return</span> response <span class="o">||</span> fetch<span class="p">(</span>e<span class="p">.</span>request<span class="p">)</span><span class="p">;</span>
-    <span class="p">}</span><span class="p">)</span><span class="p">.</span><span class="k">catch</span><span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
       <span class="k">return</span> caches<span class="p">.</span>match<span class="p">(</span><span class="s2">"/fallback.html"</span><span class="p">)</span><span class="p">;</span>
     <span class="p">}</span><span class="p">)</span>
   <span class="p">)</span><span class="p">;</span>
@@ -4056,7 +4014,7 @@ <h4 class="heading settled" data-level="6.3.2" id="importscripts"><span class="s
           <p>Set <var>request</var>’s <a data-link-type="dfn" href="https://fetch.spec.whatwg.org/#concept-request-cache-mode">cache mode</a> to "<code>no-cache</code>" if any of the following are true:</p>
           <ul>
            <li data-md="">
-            <p><var>registration</var>’s <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache-2">update via cache mode</a> is "<code>never</code>".</p>
+            <p><var>registration</var>’s <a data-link-type="dfn" href="#dfn-update-via-cache" id="ref-for-dfn-update-via-cache-2">update via cache mode</a> is "<code>none</code>".</p>
            <li data-md="">
             <p>The <a data-link-type="dfn" href="https://html.spec.whatwg.org/multipage/webappapis.html#current-global-object">current global object</a>'s <a data-link-type="dfn" href="#serviceworkerglobalscope-force-bypass-cache-for-importscripts-flag" id="ref-for-serviceworkerglobalscope-force-bypass-cache-for-importscripts-flag-1">force bypass cache for importscripts flag</a> is set.</p>
            <li data-md="">
@@ -4157,7 +4115,7 @@ <h2 class="heading settled" id="algorithms"><span class="content">Appendix A: Al
      <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-2">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-scope-url">scope url</dfn> (a <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url">URL</a>).</p>
      <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-3">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-script-url">script url</dfn> (a <a data-link-type="dfn" href="https://url.spec.whatwg.org/#concept-url">URL</a>).</p>
      <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-4">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-worker-type">worker type</dfn> ("<code>classic</code>" or "<code>module</code>").</p>
-     <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-5">job</a> has an <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-update-via-cache-mode">update via cache mode</dfn>, which is "<code>imports</code>", "<code>all</code>", or "<code>never</code>".</p>
+     <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-5">job</a> has an <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-update-via-cache-mode">update via cache mode</dfn>, which is "<code>imports</code>", "<code>all</code>", or "<code>none</code>".</p>
      <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-6">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-client">client</dfn> (a <a data-link-type="dfn" href="#dfn-service-worker-client" id="ref-for-dfn-service-worker-client-36">service worker client</a>). It is initially null.</p>
      <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-7">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-promise">job promise</dfn> (a <a data-link-type="dfn" href="http://tc39.github.io/ecma262/#sec-promise-objects">promise</a>). It is initially null.</p>
      <p>A <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-8">job</a> has a <dfn class="dfn-paneled" data-dfn-for="job" data-dfn-type="dfn" data-noexport="" id="dfn-job-list-of-equivalent-jobs">list of equivalent jobs</dfn> (a list of <a data-link-type="dfn" href="#dfn-job" id="ref-for-dfn-job-9">jobs</a>). It is initially the empty list.</p>
@@ -5874,11 +5832,7 @@ <h3 class="heading settled" id="service-worker-script-response"><span class="con
       <a class="self-link" href="#example-bf118df6"></a> Default scope: 
 <pre class="highlight"><span class="c1">// Maximum allowed scope defaults to the path the script sits in
 </span><span class="c1">// "/js" in this example
-<<<<<<< HEAD
 </span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/js/sw.js"</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="p">=></span> <span class="p">{</span>
-=======
-</span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/js/sw.js"</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   console<span class="p">.</span>log<span class="p">(</span><span class="s2">"Install succeeded with the default scope '/js'."</span><span class="p">)</span><span class="p">;</span>
 <span class="p">}</span><span class="p">)</span><span class="p">;</span>
 </pre>
@@ -5887,11 +5841,7 @@ <h3 class="heading settled" id="service-worker-script-response"><span class="con
       <a class="self-link" href="#example-76c5aa8b"></a> Upper path without Service-Worker-Allowed header: 
 <pre class="highlight"><span class="c1">// Set the scope to an upper path of the script location
 </span><span class="c1">// Response has no Service-Worker-Allowed header
-<<<<<<< HEAD
 </span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/js/sw.js"</span><span class="p">,</span> <span class="p">{</span> scope<span class="o">:</span> <span class="s2">"/"</span> <span class="p">}</span><span class="p">)</span><span class="p">.</span><span class="k">catch</span><span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="p">=></span> <span class="p">{</span>
-=======
-</span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/js/sw.js"</span><span class="p">,</span> <span class="p">{</span> scope<span class="o">:</span> <span class="s2">"/"</span> <span class="p">}</span><span class="p">)</span><span class="p">.</span><span class="k">catch</span><span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   console<span class="p">.</span>error<span class="p">(</span><span class="s2">"Install failed due to the path restriction violation."</span><span class="p">)</span><span class="p">;</span>
 <span class="p">}</span><span class="p">)</span><span class="p">;</span>
 </pre>
@@ -5900,11 +5850,7 @@ <h3 class="heading settled" id="service-worker-script-response"><span class="con
       <a class="self-link" href="#example-49d267fe"></a> Upper path with Service-Worker-Allowed header: 
 <pre class="highlight"><span class="c1">// Set the scope to an upper path of the script location
 </span><span class="c1">// Response included "Service-Worker-Allowed : /"
-<<<<<<< HEAD
 </span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/js/sw.js"</span><span class="p">,</span> <span class="p">{</span> scope<span class="o">:</span> <span class="s2">"/"</span> <span class="p">}</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="p">=></span> <span class="p">{</span>
-=======
-</span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/js/sw.js"</span><span class="p">,</span> <span class="p">{</span> scope<span class="o">:</span> <span class="s2">"/"</span> <span class="p">}</span><span class="p">)</span><span class="p">.</span>then<span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   console<span class="p">.</span>log<span class="p">(</span><span class="s2">"Install succeeded as the max allowed scope was overriden to '/'."</span><span class="p">)</span><span class="p">;</span>
 <span class="p">}</span><span class="p">)</span><span class="p">;</span>
 </pre>
@@ -5913,11 +5859,7 @@ <h3 class="heading settled" id="service-worker-script-response"><span class="con
       <a class="self-link" href="#example-7a18b25f"></a> A path restriction voliation even with Service-Worker-Allowed header: 
 <pre class="highlight"><span class="c1">// Set the scope to an upper path of the script location
 </span><span class="c1">// Response included "Service-Worker-Allowed : /foo"
-<<<<<<< HEAD
 </span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/foo/bar/sw.js"</span><span class="p">,</span> <span class="p">{</span> scope<span class="o">:</span> <span class="s2">"/"</span> <span class="p">}</span><span class="p">)</span><span class="p">.</span><span class="k">catch</span><span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="p">=></span> <span class="p">{</span>
-=======
-</span>navigator<span class="p">.</span>serviceWorker<span class="p">.</span>register<span class="p">(</span><span class="s2">"/foo/bar/sw.js"</span><span class="p">,</span> <span class="p">{</span> scope<span class="o">:</span> <span class="s2">"/"</span> <span class="p">}</span><span class="p">)</span><span class="p">.</span><span class="k">catch</span><span class="p">(</span><span class="p">(</span><span class="p">)</span> <span class="o">=</span><span class="o">></span> <span class="p">{</span>
->>>>>>> Changing useCache boolean to updateViaCache enum
   console<span class="p">.</span>error<span class="p">(</span><span class="s2">"Install failed as the scope is still out of the overriden maximum allowed scope."</span><span class="p">)</span><span class="p">;</span>
 <span class="p">}</span><span class="p">)</span><span class="p">;</span>
 </pre>
@@ -6603,7 +6545,7 @@ <h3 class="no-num no-ref heading settled" id="index-defined-elsewhere"><span cla
      <li><a href="https://infra.spec.whatwg.org/#set-append">append</a>
      <li><a href="https://infra.spec.whatwg.org/#ascii-case-insensitive">ascii case-insensitive</a>
      <li><a href="https://infra.spec.whatwg.org/#list-contain">contain</a>
-     <li><a href="https://infra.spec.whatwg.org/#map-exists">exists</a>
+     <li><a href="https://infra.spec.whatwg.org/#map-exists">exist</a>
      <li><a href="https://infra.spec.whatwg.org/#map-iterate">for each</a>
      <li><a href="https://infra.spec.whatwg.org/#map-getting-the-keys">get the keys</a>
      <li><a href="https://infra.spec.whatwg.org/#list-item">item</a>
@@ -6764,13 +6706,8 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="#serviceworker"><span class="n">ServiceWorker</span></a>? <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorker?" href="#dom-serviceworkerregistration-waiting"><span class="nv">waiting</span></a>;
   <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="#serviceworker"><span class="n">ServiceWorker</span></a>? <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorker?" href="#dom-serviceworkerregistration-active"><span class="nv">active</span></a>;
 
-<<<<<<< HEAD
   <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt"><span class="kt">USVString</span></span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="USVString" href="#dom-serviceworkerregistration-scope"><span class="nv">scope</span></a>;
-  <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-boolean"><span class="kt"><span class="kt">boolean</span></span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="boolean" href="#dom-serviceworkerregistration-usecache"><span class="nv">useCache</span></a>;
-=======
-  <span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt">USVString</span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="USVString" href="#dom-serviceworkerregistration-scope">scope</a>;
-  <span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache">ServiceWorkerUpdateViaCache</a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorkerUpdateViaCache" href="#dom-serviceworkerregistration-updateviacache">updateViaCache</a>;
->>>>>>> Changing useCache boolean to updateViaCache enum
+  <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache"><span class="n">ServiceWorkerUpdateViaCache</span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorkerUpdateViaCache" href="#dom-serviceworkerregistration-updateviacache"><span class="nv">updateViaCache</span></a>;
 
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <span class="kt"><span class="kt">Promise</span></span>&lt;<span class="kt"><span class="kt">void</span></span>> <a class="nv idl-code" data-link-type="method" href="#dom-serviceworkerregistration-update"><span class="nv">update</span></a>();
   [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#NewObject"><span class="nv">NewObject</span></a>] <span class="kt"><span class="kt">Promise</span></span>&lt;<a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-boolean"><span class="kt"><span class="kt">boolean</span></span></a>> <a class="nv idl-code" data-link-type="method" href="#dom-serviceworkerregistration-unregister"><span class="nv">unregister</span></a>();
@@ -6779,19 +6716,14 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/webappapis.html#eventhandler"><span class="n">EventHandler</span></a> <a class="nv idl-code" data-link-type="attribute" data-type="EventHandler" href="#dom-serviceworkerregistration-onupdatefound"><span class="nv">onupdatefound</span></a>;
 };
 
-<<<<<<< HEAD
-<span class="kt"><span class="kt">partial</span></span> <span class="kt"><span class="kt">interface</span></span> <a class="nv idl-code" data-link-type="interface" href="https://html.spec.whatwg.org/multipage/webappapis.html#navigator"><span class="nv">Navigator</span></a> {
-  [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SecureContext"><span class="nv">SecureContext</span></a>, <a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SameObject"><span class="nv">SameObject</span></a>] <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="#serviceworkercontainer"><span class="n">ServiceWorkerContainer</span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorkerContainer" href="#navigator-service-worker-attribute"><span class="nv">serviceWorker</span></a>;
-=======
-<span class="kt">enum</span> <a class="nv" href="#enumdef-serviceworkerupdateviacache">ServiceWorkerUpdateViaCache</a> {
-  <a class="s" href="#dom-serviceworkerupdateviacache-imports">"imports"</a>,
-  <a class="s" href="#dom-serviceworkerupdateviacache-all">"all"</a>,
-  <a class="s" href="#dom-serviceworkerupdateviacache-none">"none"</a>
+<span class="kt"><span class="kt">enum</span></span> <a class="nv" href="#enumdef-serviceworkerupdateviacache"><code><span class="nv">ServiceWorkerUpdateViaCache</span></code></a> {
+  <a class="s" href="#dom-serviceworkerupdateviacache-imports"><code><span class="s">"imports"</span></code></a>,
+  <a class="s" href="#dom-serviceworkerupdateviacache-all"><code><span class="s">"all"</span></code></a>,
+  <a class="s" href="#dom-serviceworkerupdateviacache-none"><code><span class="s">"none"</span></code></a>
 };
 
-<span class="kt">partial</span> <span class="kt">interface</span> <a class="nv idl-code" data-link-type="interface" href="https://html.spec.whatwg.org/multipage/webappapis.html#navigator">Navigator</a> {
-  [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SecureContext">SecureContext</a>, <a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SameObject">SameObject</a>] <span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="#serviceworkercontainer">ServiceWorkerContainer</a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorkerContainer" href="#navigator-service-worker-attribute">serviceWorker</a>;
->>>>>>> Changing useCache boolean to updateViaCache enum
+<span class="kt"><span class="kt">partial</span></span> <span class="kt"><span class="kt">interface</span></span> <a class="nv idl-code" data-link-type="interface" href="https://html.spec.whatwg.org/multipage/webappapis.html#navigator"><span class="nv">Navigator</span></a> {
+  [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SecureContext"><span class="nv">SecureContext</span></a>, <a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#SameObject"><span class="nv">SameObject</span></a>] <span class="kt"><span class="kt">readonly</span></span> <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="#serviceworkercontainer"><span class="n">ServiceWorkerContainer</span></a> <a class="nv idl-code" data-link-type="attribute" data-readonly="" data-type="ServiceWorkerContainer" href="#navigator-service-worker-attribute"><span class="nv">serviceWorker</span></a>;
 };
 
 <span class="kt"><span class="kt">partial</span></span> <span class="kt"><span class="kt">interface</span></span> <a class="nv idl-code" data-link-type="interface" href="https://html.spec.whatwg.org/multipage/workers.html#workernavigator"><span class="nv">WorkerNavigator</span></a> {
@@ -6817,17 +6749,10 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
   <span class="kt"><span class="kt">attribute</span></span> <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/webappapis.html#eventhandler"><span class="n">EventHandler</span></a> <a class="nv idl-code" data-link-type="attribute" data-type="EventHandler" href="#dom-serviceworkercontainer-onmessageerror"><span class="nv">onmessageerror</span></a>;
 };
 
-<<<<<<< HEAD
 <span class="kt"><span class="kt">dictionary</span></span> <a class="nv" href="#dictdef-registrationoptions"><code><span class="nv">RegistrationOptions</span></code></a> {
   <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt"><span class="kt">USVString</span></span></a> <a class="nv" data-type="USVString " href="#dom-registrationoptions-scope"><code><span class="nv">scope</span></code></a>;
   <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/workers.html#workertype"><span class="n">WorkerType</span></a> <a class="nv" data-default="&quot;classic&quot;" data-type="WorkerType " href="#dom-registrationoptions-type"><code><span class="nv">type</span></code></a> = "classic";
-  <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-boolean"><span class="kt"><span class="kt">boolean</span></span></a> <a class="nv" data-default="false" data-type="boolean " href="#dom-registrationoptions-usecache"><code><span class="nv">useCache</span></code></a> = <span class="kt"><span class="kt">false</span></span>;
-=======
-<span class="kt">dictionary</span> <a class="nv" href="#dictdef-registrationoptions">RegistrationOptions</a> {
-  <a class="n idl-code" data-link-type="interface" href="https://heycam.github.io/webidl/#idl-USVString"><span class="kt">USVString</span></a> <a class="nv" data-type="USVString " href="#dom-registrationoptions-scope">scope</a>;
-  <a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/workers.html#workertype">WorkerType</a> <a class="nv" data-default="&quot;classic&quot;" data-type="WorkerType " href="#dom-registrationoptions-type">type</a> = "classic";
-  <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache">ServiceWorkerUpdateViaCache</a> <a class="nv" data-default="&quot;imports&quot;" data-type="ServiceWorkerUpdateViaCache " href="#dom-registrationoptions-updateviacache">updateViaCache</a> = "imports";
->>>>>>> Changing useCache boolean to updateViaCache enum
+  <a class="n" data-link-type="idl-name" href="#enumdef-serviceworkerupdateviacache"><span class="n">ServiceWorkerUpdateViaCache</span></a> <a class="nv" data-default="&quot;imports&quot;" data-type="ServiceWorkerUpdateViaCache " href="#dom-registrationoptions-updateviacache"><code><span class="nv">updateViaCache</span></code></a> = "imports";
 };
 
 [<a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#Global"><span class="nv">Global</span></a>=(<a class="n" data-link-type="idl-name" href="https://html.spec.whatwg.org/multipage/workers.html#worker"><span class="n">Worker</span></a>,<a class="n" data-link-type="idl-name" href="#serviceworker"><span class="n">ServiceWorker</span></a>), <a class="nv idl-code" data-link-type="extended-attribute" href="https://heycam.github.io/webidl/#Exposed"><span class="nv">Exposed</span></a>=<span class="n"><span class="n">ServiceWorker</span></span>]