diff --git a/index.html b/index.html
index 2aceb17..e80982b 100644
--- a/index.html
+++ b/index.html
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 <!doctype html>
 <head><meta charset="utf-8">
 <title>Intl.DurationFormat</title><script>'use strict';
@@ -2695,7 +2693,7 @@
 </ul></div><div id="menu-toggle"><svg xmlns="http://www.w3.org/2000/svg" style="width:100%; height:100%; stroke:currentColor" viewBox="0 0 120 120">
       <title>Menu</title>
       <path stroke-width="10" stroke-linecap="round" d="M30,60 h60  M30,30 m0,5 h60  M30,90 m0,-5 h60"></path>
-    </svg></div><div id="menu-spacer" class="menu-spacer"></div><div id="menu"><div id="menu-search"><input type="text" id="menu-search-box" placeholder="Search..."><div id="menu-search-results" class="inactive"></div></div><div id="menu-pins"><div class="menu-pane-header">Pins</div><ul id="menu-pins-list"></ul></div><div class="menu-pane-header">Table of Contents</div><div id="menu-toc"><ol class="toc"><li><span class="item-toggle">◢</span><a href="#durationformat-objects" title="DurationFormat Objects"><span class="secnum">1</span> DurationFormat Objects</a><ol class="toc"><li><span class="item-toggle">◢</span><a href="#sec-intl-durationformat-abstracts" title="Abstract Operations for DurationFormat Objects"><span class="secnum">1.1</span> Abstract Operations for DurationFormat Objects</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-duration-records" title="Duration Records"><span class="secnum">1.1.1</span> Duration Records</a></li><li><span class="item-toggle-none"></span><a href="#sec-tointegerwithoutrounding" title="ToIntegerIfIntegral ( argument )"><span class="secnum">1.1.2</span> ToIntegerIfIntegral ( <var>argument</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-todurationrecord" title="ToDurationRecord ( input )"><span class="secnum">1.1.3</span> ToDurationRecord ( <var>input</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-durationrecordsign" title="DurationRecordSign ( record )"><span class="secnum">1.1.4</span> DurationRecordSign ( <var>record</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-isvaliddurationrecord" title="IsValidDurationRecord ( record )"><span class="secnum">1.1.5</span> IsValidDurationRecord ( <var>record</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-getdurationunitoptions" title="GetDurationUnitOptions ( unit, options, baseStyle, stylesList, digitalBase, prevStyle, twoDigitHours )"><span class="secnum">1.1.6</span> GetDurationUnitOptions ( <var>unit</var>, <var>options</var>, <var>baseStyle</var>, <var>stylesList</var>, <var>digitalBase</var>, <var>prevStyle</var>, <var>twoDigitHours</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-addfractionaldigits" title="AddFractionalDigits ( durationFormat, duration )"><span class="secnum">1.1.7</span> AddFractionalDigits ( <var>durationFormat</var>, <var>duration</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-nextunitfractional" title="NextUnitFractional ( durationFormat, unit )"><span class="secnum">1.1.8</span> NextUnitFractional ( <var>durationFormat</var>, <var>unit</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-formatnumerichours" title="FormatNumericHours ( durationFormat, hoursValue, signDisplayed )"><span class="secnum">1.1.9</span> FormatNumericHours ( <var>durationFormat</var>, <var>hoursValue</var>, <var>signDisplayed</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-formatnumericminutes" title="FormatNumericMinutes ( durationFormat, minutesValue, hoursDisplayed, signDisplayed )"><span class="secnum">1.1.10</span> FormatNumericMinutes ( <var>durationFormat</var>, <var>minutesValue</var>, <var>hoursDisplayed</var>, <var>signDisplayed</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-formatnumericseconds" title="FormatNumericSeconds ( durationFormat, secondsValue, minutesDisplayed, signDisplayed )"><span class="secnum">1.1.11</span> FormatNumericSeconds ( <var>durationFormat</var>, <var>secondsValue</var>, <var>minutesDisplayed</var>, <var>signDisplayed</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-formatnumericunits" title="FormatNumericUnits ( durationFormat, duration, firstNumericUnit, signDisplayed )"><span class="secnum">1.1.12</span> FormatNumericUnits ( <var>durationFormat</var>, <var>duration</var>, <var>firstNumericUnit</var>, <var>signDisplayed</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-listformatparts" title="ListFormatParts ( durationFormat, partitionedPartsList )"><span class="secnum">1.1.13</span> ListFormatParts ( <var>durationFormat</var>, <var>partitionedPartsList</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-partitiondurationformatpattern" title="PartitionDurationFormatPattern ( durationFormat, duration )"><span class="secnum">1.1.14</span> PartitionDurationFormatPattern ( <var>durationFormat</var>, <var>duration</var> )</a></li></ol></li><li><span class="item-toggle">◢</span><a href="#sec-intl-durationformat-constructor" title="The Intl.DurationFormat Constructor"><span class="secnum">1.2</span> The Intl.DurationFormat Constructor</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat" title="Intl.DurationFormat ( [ locales [ , options ] ] )"><span class="secnum">1.2.1</span> Intl.DurationFormat ( [ <var>locales</var> [ , <var>options</var> ] ] )</a></li></ol></li><li><span class="item-toggle">◢</span><a href="#sec-properties-of-intl-durationformat-constructor" title="Properties of the Intl.DurationFormat Constructor"><span class="secnum">1.3</span> Properties of the Intl.DurationFormat Constructor</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.prototype" title="Intl.DurationFormat.prototype"><span class="secnum">1.3.1</span> Intl.DurationFormat.prototype</a></li><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.supportedLocalesOf" title="Intl.DurationFormat.supportedLocalesOf ( locales [ , options ] )"><span class="secnum">1.3.2</span> Intl.DurationFormat.supportedLocalesOf ( <var>locales</var> [ , <var>options</var> ] )</a></li><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat-internal-slots" title="Internal slots"><span class="secnum">1.3.3</span> Internal slots</a></li></ol></li><li><span class="item-toggle">◢</span><a href="#sec-properties-of-intl-durationformat-prototype-object" title="Properties of the Intl.DurationFormat Prototype Object"><span class="secnum">1.4</span> Properties of the Intl.DurationFormat Prototype Object</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.prototype.constructor" title="Intl.DurationFormat.prototype.constructor"><span class="secnum">1.4.1</span> Intl.DurationFormat.prototype.constructor</a></li><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.prototype-@@tostringtag" title="Intl.DurationFormat.prototype [ @@toStringTag ]"><span class="secnum">1.4.2</span> Intl.DurationFormat.prototype [ @@toStringTag ]</a></li><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.prototype.format" title="Intl.DurationFormat.prototype.format ( duration )"><span class="secnum">1.4.3</span> Intl.DurationFormat.prototype.format ( <var>duration</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.prototype.formatToParts" title="Intl.DurationFormat.prototype.formatToParts ( duration )"><span class="secnum">1.4.4</span> Intl.DurationFormat.prototype.formatToParts ( <var>duration</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.prototype.resolvedOptions" title="Intl.DurationFormat.prototype.resolvedOptions ( )"><span class="secnum">1.4.5</span> Intl.DurationFormat.prototype.resolvedOptions ( )</a></li></ol></li><li><span class="item-toggle-none"></span><a href="#sec-properties-of-intl-durationformat-instances" title="Properties of Intl.DurationFormat Instances"><span class="secnum">1.5</span> Properties of Intl.DurationFormat Instances</a></li></ol></li><li><span class="item-toggle-none"></span><a href="#sec-copyright-and-software-license" title="Copyright &amp; Software License"><span class="secnum">A</span> Copyright &amp; Software License</a></li></ol></div></div><div id="spec-container"><h1 class="version">Stage 3 Draft / April 24, 2024</h1><h1 class="title">Intl.DurationFormat</h1>
+    </svg></div><div id="menu-spacer" class="menu-spacer"></div><div id="menu"><div id="menu-search"><input type="text" id="menu-search-box" placeholder="Search..."><div id="menu-search-results" class="inactive"></div></div><div id="menu-pins"><div class="menu-pane-header">Pins</div><ul id="menu-pins-list"></ul></div><div class="menu-pane-header">Table of Contents</div><div id="menu-toc"><ol class="toc"><li><span class="item-toggle">◢</span><a href="#durationformat-objects" title="DurationFormat Objects"><span class="secnum">1</span> DurationFormat Objects</a><ol class="toc"><li><span class="item-toggle">◢</span><a href="#sec-intl-durationformat-abstracts" title="Abstract Operations for DurationFormat Objects"><span class="secnum">1.1</span> Abstract Operations for DurationFormat Objects</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-duration-records" title="Duration Records"><span class="secnum">1.1.1</span> Duration Records</a></li><li><span class="item-toggle-none"></span><a href="#sec-tointegerwithoutrounding" title="ToIntegerIfIntegral ( argument )"><span class="secnum">1.1.2</span> ToIntegerIfIntegral ( <var>argument</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-todurationrecord" title="ToDurationRecord ( input )"><span class="secnum">1.1.3</span> ToDurationRecord ( <var>input</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-durationrecordsign" title="DurationRecordSign ( record )"><span class="secnum">1.1.4</span> DurationRecordSign ( <var>record</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-isvaliddurationrecord" title="IsValidDurationRecord ( record )"><span class="secnum">1.1.5</span> IsValidDurationRecord ( <var>record</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-getdurationunitoptions" title="GetDurationUnitOptions ( unit, options, baseStyle, stylesList, digitalBase, prevStyle, twoDigitHours )"><span class="secnum">1.1.6</span> GetDurationUnitOptions ( <var>unit</var>, <var>options</var>, <var>baseStyle</var>, <var>stylesList</var>, <var>digitalBase</var>, <var>prevStyle</var>, <var>twoDigitHours</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-addfractionaldigits" title="AddFractionalDigits ( durationFormat, duration )"><span class="secnum">1.1.7</span> AddFractionalDigits ( <var>durationFormat</var>, <var>duration</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-nextunitfractional" title="NextUnitFractional ( durationFormat, unit )"><span class="secnum">1.1.8</span> NextUnitFractional ( <var>durationFormat</var>, <var>unit</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-formatnumerichours" title="FormatNumericHours ( durationFormat, hoursValue, signDisplayed )"><span class="secnum">1.1.9</span> FormatNumericHours ( <var>durationFormat</var>, <var>hoursValue</var>, <var>signDisplayed</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-formatnumericminutes" title="FormatNumericMinutes ( durationFormat, minutesValue, hoursDisplayed, signDisplayed )"><span class="secnum">1.1.10</span> FormatNumericMinutes ( <var>durationFormat</var>, <var>minutesValue</var>, <var>hoursDisplayed</var>, <var>signDisplayed</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-formatnumericseconds" title="FormatNumericSeconds ( durationFormat, secondsValue, minutesDisplayed, signDisplayed )"><span class="secnum">1.1.11</span> FormatNumericSeconds ( <var>durationFormat</var>, <var>secondsValue</var>, <var>minutesDisplayed</var>, <var>signDisplayed</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-formatnumericunits" title="FormatNumericUnits ( durationFormat, duration, firstNumericUnit, signDisplayed )"><span class="secnum">1.1.12</span> FormatNumericUnits ( <var>durationFormat</var>, <var>duration</var>, <var>firstNumericUnit</var>, <var>signDisplayed</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-listformatparts" title="ListFormatParts ( durationFormat, partitionedPartsList )"><span class="secnum">1.1.13</span> ListFormatParts ( <var>durationFormat</var>, <var>partitionedPartsList</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-partitiondurationformatpattern" title="PartitionDurationFormatPattern ( durationFormat, duration )"><span class="secnum">1.1.14</span> PartitionDurationFormatPattern ( <var>durationFormat</var>, <var>duration</var> )</a></li></ol></li><li><span class="item-toggle">◢</span><a href="#sec-intl-durationformat-constructor" title="The Intl.DurationFormat Constructor"><span class="secnum">1.2</span> The Intl.DurationFormat Constructor</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat" title="Intl.DurationFormat ( [ locales [ , options ] ] )"><span class="secnum">1.2.1</span> Intl.DurationFormat ( [ <var>locales</var> [ , <var>options</var> ] ] )</a></li></ol></li><li><span class="item-toggle">◢</span><a href="#sec-properties-of-intl-durationformat-constructor" title="Properties of the Intl.DurationFormat Constructor"><span class="secnum">1.3</span> Properties of the Intl.DurationFormat Constructor</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.prototype" title="Intl.DurationFormat.prototype"><span class="secnum">1.3.1</span> Intl.DurationFormat.prototype</a></li><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.supportedLocalesOf" title="Intl.DurationFormat.supportedLocalesOf ( locales [ , options ] )"><span class="secnum">1.3.2</span> Intl.DurationFormat.supportedLocalesOf ( <var>locales</var> [ , <var>options</var> ] )</a></li><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat-internal-slots" title="Internal slots"><span class="secnum">1.3.3</span> Internal slots</a></li></ol></li><li><span class="item-toggle">◢</span><a href="#sec-properties-of-intl-durationformat-prototype-object" title="Properties of the Intl.DurationFormat Prototype Object"><span class="secnum">1.4</span> Properties of the Intl.DurationFormat Prototype Object</a><ol class="toc"><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.prototype.constructor" title="Intl.DurationFormat.prototype.constructor"><span class="secnum">1.4.1</span> Intl.DurationFormat.prototype.constructor</a></li><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.prototype-@@tostringtag" title="Intl.DurationFormat.prototype [ @@toStringTag ]"><span class="secnum">1.4.2</span> Intl.DurationFormat.prototype [ @@toStringTag ]</a></li><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.prototype.format" title="Intl.DurationFormat.prototype.format ( duration )"><span class="secnum">1.4.3</span> Intl.DurationFormat.prototype.format ( <var>duration</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.prototype.formatToParts" title="Intl.DurationFormat.prototype.formatToParts ( duration )"><span class="secnum">1.4.4</span> Intl.DurationFormat.prototype.formatToParts ( <var>duration</var> )</a></li><li><span class="item-toggle-none"></span><a href="#sec-Intl.DurationFormat.prototype.resolvedOptions" title="Intl.DurationFormat.prototype.resolvedOptions ( )"><span class="secnum">1.4.5</span> Intl.DurationFormat.prototype.resolvedOptions ( )</a></li></ol></li><li><span class="item-toggle-none"></span><a href="#sec-properties-of-intl-durationformat-instances" title="Properties of Intl.DurationFormat Instances"><span class="secnum">1.5</span> Properties of Intl.DurationFormat Instances</a></li></ol></li><li><span class="item-toggle-none"></span><a href="#sec-copyright-and-software-license" title="Copyright &amp; Software License"><span class="secnum">A</span> Copyright &amp; Software License</a></li></ol></div></div><div id="spec-container"><h1 class="version">Stage 3 Draft / May 20, 2024</h1><h1 class="title">Intl.DurationFormat</h1>
 <emu-biblio href="./biblio.json"></emu-biblio>
 <emu-clause id="durationformat-objects">
   <h1><span class="secnum">1</span> DurationFormat Objects</h1>
@@ -3029,22 +3027,22 @@ <h1><span class="secnum">1.2.1</span> Intl.DurationFormat ( [ <var>locales</var>
             <td><var class="field">[[MillisecondsStyle]]</var></td>
             <td><var class="field">[[MillisecondsDisplay]]</var></td>
             <td><emu-val>"milliseconds"</emu-val></td>
-            <td>« <emu-val>"long"</emu-val>, <emu-val>"short"</emu-val>, <emu-val>"narrow"</emu-val>, <br><emu-val>"fractional"</emu-val> »</td>
+            <td>« <emu-val>"long"</emu-val>, <emu-val>"short"</emu-val>, <emu-val>"narrow"</emu-val>, <br><emu-val>"numeric"</emu-val> »</td>
             <td><emu-val>"numeric"</emu-val></td>
           </tr>
           <tr>
             <td><var class="field">[[MicrosecondsStyle]]</var></td>
             <td><var class="field">[[MicrosecondsDisplay]]</var></td>
             <td><emu-val>"microseconds"</emu-val></td>
-            <td>« <emu-val>"long"</emu-val>, <emu-val>"short"</emu-val>, <emu-val>"narrow"</emu-val>, <br><emu-val>"fractional"</emu-val> »</td>
-            <td><emu-val>"fractional"</emu-val></td>
+            <td>« <emu-val>"long"</emu-val>, <emu-val>"short"</emu-val>, <emu-val>"narrow"</emu-val>, <br><emu-val>"numeric"</emu-val> »</td>
+            <td><emu-val>"numeric"</emu-val></td>
           </tr>
           <tr>
             <td><var class="field">[[NanosecondsStyle]]</var></td>
             <td><var class="field">[[NanosecondsDisplay]]</var></td>
             <td><emu-val>"nanoseconds"</emu-val></td>
-            <td>« <emu-val>"long"</emu-val>, <emu-val>"short"</emu-val>, <emu-val>"narrow"</emu-val>, <br><emu-val>"fractional"</emu-val> »</td>
-            <td><emu-val>"fractional"</emu-val></td>
+            <td>« <emu-val>"long"</emu-val>, <emu-val>"short"</emu-val>, <emu-val>"narrow"</emu-val>, <br><emu-val>"numeric"</emu-val> »</td>
+            <td><emu-val>"numeric"</emu-val></td>
           </tr>
         </tbody></table>
     </figure></emu-table>
@@ -3299,5 +3297,4 @@ <h2>Software License</h2>
 <p>THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
 
     </emu-annex>
-</div></body>
->>>>>>> c6025ef (Editorial: The previous version of the spec adds fractional digit-related options to _nfOpts_ whenever there are fractional-styled subsecond units, even if the value of all of those units is 0. In practice, this means that whenever numeric seconds are formatted, the _nfOpts_ for maximum and minimum fractional digits get passed to the NumberFormat. In order to avoid normative changes, I've removed everything that tests for whether non-zero fractional-styled units exist.)
+</div></body>
\ No newline at end of file
