diff --git a/docs/index.html b/docs/index.html
index 38c2b181..550569ae 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -14,7 +14,6 @@
     <link rel="stylesheet" href="placeholder-style.css" />
 
     <!-- And a slew of SEO related meta elements, because being discoverable is important -->
-<<<<<<< HEAD
 <meta name="description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
 
 <!-- opengraph information -->
@@ -37,30 +36,6 @@
 <meta name="twitter:image" content="https://pomax.github.io/bezierinfo/images/og-image.png" />
 <meta name="twitter:url" content="https://pomax.github.io/bezierinfo" />
 <meta name="twitter:description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
-=======
-    <meta name="description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
-
-    <!-- opengraph information -->
-    <meta property="og:title" content="A Primer on Bézier Curves" />
-    <meta property="og:image" content="https://pomax.github.io/bezierinfo/images/og-image.png" />
-    <meta property="og:type" content="text" />
-    <meta property="og:url" content="https://pomax.github.io/bezierinfo" />
-    <meta property="og:description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
-    <meta property="og:locale" content="en-GB}}" />
-    <meta property="og:type" content="article" />
-    <meta property="og:published_time" content="2013-06-13 12:00:00" />
-    <meta property="og:author" content="Mike 'Pomax' Kamermans" />
-    <meta property="og:section" content="Bézier Curves" />
-    <meta property="og:tag" content="Bézier Curves" />
-
-    <!-- twitter card information -->
-    <meta name="twitter:card" content="summary" />
-    <meta name="twitter:site" content="@TheRealPomax" />
-    <meta name="twitter:creator" content="@TheRealPomax" />
-    <meta name="twitter:image" content="https://pomax.github.io/bezierinfo/images/og-image.png" />
-    <meta name="twitter:url" content="https://pomax.github.io/bezierinfo" />
-    <meta name="twitter:description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
 
     <!-- my own referral/page hit tracker, because Google knows enough -->
     <script src="./js/site/referrer.js" type="module" async></script>
@@ -79,7 +54,6 @@
   </head>
 
   <body>
-<<<<<<< HEAD
     <div class="dev" style="display:none;">
     DEV PREVIEW ONLY
     <script>
@@ -122,20 +96,11 @@
       <h1>A Primer on Bézier Curves</h1>
       <h2>A free, online book for when you really need to know how to do Bézier things.</h2>
       <span>Read this in your own language:</span>
-=======
-    <header>
-      <h1>A Primer on Bézier Curves</h1>
-      <h2>A free, online book for when you really need to know how to do Bézier things.</h2>
-
-      <span>Read this in your own language:</span>
-
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
       <ul class="lang-switcher">
         <li><a href="./index.html">English</a></li>
 <li><a href="./ja-JP/index.html">日本語</a></li>
 <li><a href="./zh-CN/index.html">中文</a></li>
       </ul>
-<<<<<<< HEAD
       <p>Don't see your language listed? <a href="https://github.com/Pomax/BezierInfo-2/wiki/localize">Help translate this content!</a></p>
 
       <noscript>
@@ -146,32 +111,13 @@
         </header>
 
         <p>
-=======
-
-      <p>Don't see your language listed? <a href="https://github.com/Pomax/BezierInfo-2/wiki/localize">Help translate this content!</a></p>
-
-      <noscript>
-        <div class="note">
-          <header>
-            <h2>This site (obviously) works best with JS enabled</h2>
-            <h3>But it's not required.</h3>
-          </header>
-
-          <p>
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
             If you can read this &lt;noscript&gt; content, you have scripts disabled: thankfully,
             this site is not going to force you to turn it on just to see any content. Everything
             will work just fine, you can still read the text, navigate to sections, and see the
             graphics that are used to illustrate the concepts that individual sections talk about.
-<<<<<<< HEAD
         </p>
 
         <p>
-=======
-          </p>
-
-          <p>
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
             <strong>However</strong>, a big part of this primer's experience is the fact that all
             graphics are interactive, and for that to work, HTML Custom Elements need to work,
             which requires Javascript to be enabled. If anything, you'll probably want to allow
@@ -182,15 +128,9 @@
             lets me see who's linking to the primer, which you probably don't care about, but lets
             me strike up conversations with folks who I would otherwise never know thought the
             primer was worth linking to, and I like talking to people who care enough to link)
-<<<<<<< HEAD
         </p>
     </div>
 </noscript>
-=======
-          </p>
-        </div>
-      </noscript>
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
 
       <nav aria-labelledby="toc">
         <h1 id="toc">Table of Contents</h1>
@@ -274,17 +214,9 @@
       <section id="changelog">
         <h1>What's new?</h1>
         <p>This primer is a living document, and so depending on when you last look at it, there may be new content. Click the following link to expand this section to have a look at what got added, when.</p>
-<<<<<<< HEAD
         <!-- non-JS content reveals are nice -->
         <label for="changelogtoggle">Toggle changes</label>
         <input type="checkbox" id="changelogtoggle">
-=======
-
-        <!-- non-JS content reveals are nice -->
-        <label for="changelogtoggle">Toggle changes</label>
-        <input type="checkbox" id="changelogtoggle">
-
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
         <section><h2>August-September 2020</h2><ul><li>Completely overhauled the site: the Primer is now a normal web page that works fine with JS disabled, but obviously better with JS turned on.</li></ul>
 <h2>June 2020</h2><ul><li>Added automatic CI/CD using Github Actions</li></ul>
 <h2>January 2020</h2><ul><li>Added reset buttons to all graphics</li>
@@ -334,21 +266,13 @@
   <graphics-element title="A quadratic Bézier curve" width="275" height="275" src="./chapters/introduction/quadratic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\introduction\54e9ec0600ac436b0e6f0c6b5005cf03.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/introduction/54e9ec0600ac436b0e6f0c6b5005cf03.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A quadratic Bézier curve</label>
         </fallback-image></graphics-element>
   <graphics-element title="A cubic Bézier curve" width="275" height="275" src="./chapters/introduction/cubic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\introduction\8d158a13e9a86969b99c64057644cbc6.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/introduction/8d158a13e9a86969b99c64057644cbc6.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A cubic Bézier curve</label>
         </fallback-image></graphics-element>
 </div>
@@ -366,11 +290,7 @@
 <graphics-element title="Linear Interpolation leading to Bézier curves" width="825" height="275" src="./chapters/whatis/interpolation.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
-          <img width="825px" height="275px" src="images\chapters\whatis\9b3633889c38325c24c19ce18ab94ad6.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/whatis/524dd296e96c0fe2281fb95146f8ea65.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
+          <img width="825px" height="275px" src="images\chapters\whatis\524dd296e96c0fe2281fb95146f8ea65.png">
           <label></label>
         </fallback-image>
   <input type="range" min="10" max="90" step="1" value="25" class="slide-control">
@@ -398,11 +318,7 @@
 <graphics-element title="A (partial) circle: x=sin(t), y=cos(t)" width="275" height="275" src="./chapters/explanation/circle.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\explanation\6d2f915735ebdc05e42c0ea7adc85343.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/explanation/6d2f915735ebdc05e42c0ea7adc85343.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A (partial) circle: x=sin(t), y=cos(t)</label>
         </fallback-image>
   <input type="range" min="0" max="10" step="0.1" value="5" class="slide-control">
@@ -485,11 +401,7 @@ function Bezier(3,t):
   <graphics-element title="Quadratic interpolations" width="275" height="275" src="./chapters/control/lerp.js" data-degree="3">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\control\2a0635829051977b265b64ef204f718e.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/control/2a0635829051977b265b64ef204f718e.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Quadratic interpolations</label>
         </fallback-image>
     <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -498,11 +410,7 @@ function Bezier(3,t):
   <graphics-element title="Cubic interpolations" width="275" height="275" src="./chapters/control/lerp.js" data-degree="4">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\control\fca18b2602929f80e68d8964832f0f44.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/control/fca18b2602929f80e68d8964832f0f44.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Cubic interpolations</label>
         </fallback-image>
     <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -511,11 +419,7 @@ function Bezier(3,t):
   <graphics-element title="15th degree interpolations" width="275" height="275" src="./chapters/control/lerp.js" data-degree="15">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\control\989f4ca49d7099802cc0345dbeddca8c.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/control/989f4ca49d7099802cc0345dbeddca8c.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>15th degree interpolations</label>
         </fallback-image>
     <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -531,11 +435,7 @@ function Bezier(3,t):
 <graphics-element title="Our cubic Bézier curve" width="275" height="275" src="./chapters/control/../introduction/cubic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\introduction\8d158a13e9a86969b99c64057644cbc6.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/introduction/8d158a13e9a86969b99c64057644cbc6.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Our cubic Bézier curve</label>
         </fallback-image></graphics-element>
 
@@ -581,11 +481,7 @@ function Bezier(3,t,w[]):
 <graphics-element title="Our rational cubic Bézier curve" width="275" height="275" src="./chapters/weightcontrol/rational.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\weightcontrol\be18e8119472af796329f3e2159bdf94.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/weightcontrol/be18e8119472af796329f3e2159bdf94.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Our rational cubic Bézier curve</label>
         </fallback-image>
   <input type="range" min="0.01" max="2" value="1" step="0.01" class="ratio-1">
@@ -644,21 +540,13 @@ function RationalBezier(3,t,w[],r[]):
 <graphics-element title="Quadratic infinite interval Bézier curve" width="275" height="275" src="./chapters/extended/extended.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\extended\391a61142c56b79260680aefb08cd9c4.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/extended/391a61142c56b79260680aefb08cd9c4.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Quadratic infinite interval Bézier curve</label>
         </fallback-image></graphics-element>
 <graphics-element title="Cubic infinite interval Bézier curve" width="275" height="275" src="./chapters/extended/extended.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\extended\baeceec6e1587794b8b275a90d5d85e9.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/extended/baeceec6e1587794b8b275a90d5d85e9.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Cubic infinite interval Bézier curve</label>
         </fallback-image></graphics-element>
 </div>
@@ -711,11 +599,7 @@ function RationalBezier(3,t,w[],r[]):
 <graphics-element title="Traversing a curve using de Casteljau's algorithm" width="275" height="275" src="./chapters/decasteljau/decasteljau.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\decasteljau\715d1d2eecc762d6bc1470954b145018.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/decasteljau/715d1d2eecc762d6bc1470954b145018.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Traversing a curve using de Casteljau's algorithm</label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -757,11 +641,7 @@ function RationalBezier(3,t,w[],r[]):
   <graphics-element title="Flattening a quadratic curve" width="275" height="275" src="./chapters/flattening/flatten.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\flattening\3deec756c96e53127cd1d615c61043ae.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/flattening/3deec756c96e53127cd1d615c61043ae.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Flattening a quadratic curve</label>
         </fallback-image>
     <input type="range" min="1" max="16" step="1" value="4" class="slide-control">
@@ -770,11 +650,7 @@ function RationalBezier(3,t,w[],r[]):
   <graphics-element title="Flattening a cubic curve" width="275" height="275" src="./chapters/flattening/flatten.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\flattening\e2bb7113d5cda2e3fd29bbc54fbe8841.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/flattening/e2bb7113d5cda2e3fd29bbc54fbe8841.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Flattening a cubic curve</label>
         </fallback-image>
     <input type="range" min="1" max="24" step="1" value="8" class="slide-control">
@@ -811,11 +687,7 @@ function RationalBezier(3,t,w[],r[]):
 <graphics-element title="Splitting a curve" width="825" height="275" src="./chapters/splitting/splitting.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\splitting\891133c5f0e140b8c7e179af04e497e0.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/splitting/891133c5f0e140b8c7e179af04e497e0.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0.5" class="slide-control">
@@ -939,11 +811,7 @@ function drawCurve(points[], t):
 <graphics-element title="A variable-order Bézier curve" width="275" height="275" src="./chapters/reordering/reorder.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\reordering\71f47629388901b821976e034be159e4.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/reordering/71f47629388901b821976e034be159e4.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A variable-order Bézier curve</label>
         </fallback-image>
   <button class="raise">raise</button>
@@ -1019,21 +887,13 @@ treated as a sequence of three (elementary) shear operations. When we combine th
   <graphics-element title="Quadratic Bézier tangents and normals" width="275" height="275" src="./chapters/pointvectors/pointvectors.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointvectors\f4d72cc162d4cbcc6d6a459fced01cfb.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointvectors/f4d72cc162d4cbcc6d6a459fced01cfb.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Quadratic Bézier tangents and normals</label>
         </fallback-image></graphics-element>
   <graphics-element title="Cubic Bézier tangents and normals" width="275" height="275" src="./chapters/pointvectors/pointvectors.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointvectors\2724b6c42f36b4dbea6962cac844d2c3.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointvectors/2724b6c42f36b4dbea6962cac844d2c3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Cubic Bézier tangents and normals</label>
         </fallback-image></graphics-element>
 </div>
@@ -1063,11 +923,7 @@ treated as a sequence of three (elementary) shear operations. When we combine th
 <graphics-element title="Some known and unknown vectors" width="350" height="300" src="./chapters/pointvectors3d/frenet.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="350px" height="300px" src="images\chapters\pointvectors3d\59b6ce3fcbf79da171d86e962597097e.png">
-=======
-          <img width="350px" height="300px" src="images/chapters/pointvectors3d/59b6ce3fcbf79da171d86e962597097e.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -1142,11 +998,7 @@ treated as a sequence of three (elementary) shear operations. When we combine th
 <graphics-element title="Some known and unknown vectors" width="350" height="300" src="./chapters/pointvectors3d/rotation-minimizing.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="350px" height="300px" src="images\chapters\pointvectors3d\9983328e50c2156c124bb1ea4ad5c05b.png">
-=======
-          <img width="350px" height="300px" src="images/chapters/pointvectors3d/9983328e50c2156c124bb1ea4ad5c05b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -1165,22 +1017,14 @@ treated as a sequence of three (elementary) shear operations. When we combine th
 <graphics-element title="Quadratic Bézier curve components" width="825" height="275" src="./chapters/components/components.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\components\008604bc4c53bd7e0d97c99a67812ad1.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/components/008604bc4c53bd7e0d97c99a67812ad1.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
 <graphics-element title="Cubic Bézier curve components" width="825" height="275" src="./chapters/components/components.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\components\5214256129e6396e7ac1f1713fa9c88d.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/components/5214256129e6396e7ac1f1713fa9c88d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1317,11 +1161,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Quadratic Bézier curve extremities" width="825" height="275" src="./chapters/extremities/extremities.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\extremities\9850eec01924deae7fda4400ce44270d.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/extremities/9850eec01924deae7fda4400ce44270d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1329,11 +1169,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Cubic Bézier curve extremities" width="825" height="275" src="./chapters/extremities/extremities.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\extremities\890406c7bc96904224f8f14940bf3e56.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/extremities/890406c7bc96904224f8f14940bf3e56.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1352,21 +1188,13 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Quadratic Bézier bounding box" width="275" height="275" src="./chapters/boundingbox/bbox.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\boundingbox\e2c621442e98e2cd20af7efe1cfb041f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/boundingbox/e2c621442e98e2cd20af7efe1cfb041f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Quadratic Bézier bounding box</label>
         </fallback-image></graphics-element>
 <graphics-element title="Cubic Bézier bounding box" width="275" height="275" src="./chapters/boundingbox/bbox.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\boundingbox\f8989a62ebec9d6f123291c146caab5b.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/boundingbox/f8989a62ebec9d6f123291c146caab5b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Cubic Bézier bounding box</label>
         </fallback-image></graphics-element>
 </div>
@@ -1390,21 +1218,13 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Aligning a quadratic curve" width="550" height="275" src="./chapters/aligning/aligning.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\aligning\b3ccd45a72c815388aee6515fe37a486.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/aligning/b3ccd45a72c815388aee6515fe37a486.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 <graphics-element title="Aligning a cubic curve" width="550" height="275" src="./chapters/aligning/aligning.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\aligning\31655f24b7dd8b8871687b6610d9ac0e.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/aligning/31655f24b7dd8b8871687b6610d9ac0e.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 </div>
@@ -1418,21 +1238,13 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Aligning a quadratic curve" width="275" height="275" src="./chapters/tightbounds/tightbounds.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\tightbounds\ccc77ae1f57d7dd7ce4d5397fe1b140b.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/tightbounds/ccc77ae1f57d7dd7ce4d5397fe1b140b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Aligning a quadratic curve</label>
         </fallback-image></graphics-element>
 <graphics-element title="Aligning a cubic curve" width="275" height="275" src="./chapters/tightbounds/tightbounds.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\tightbounds\419415bee6ffd7598c035c42de09a94f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/tightbounds/419415bee6ffd7598c035c42de09a94f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Aligning a cubic curve</label>
         </fallback-image></graphics-element>
 </div>
@@ -1473,11 +1285,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Finding cubic Bézier curve inflections" width="275" height="275" src="./chapters/inflections/inflection.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\inflections\9e1ce3975100600d4979370851929b73.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/inflections/9e1ce3975100600d4979370851929b73.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Finding cubic Bézier curve inflections</label>
         </fallback-image></graphics-element>
 
@@ -1490,11 +1298,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="The canonical curve map" width="400" height="400" src="./chapters/canonical/canonical.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\canonical\c086e72bd8aaeab37436515ab251b2df.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/canonical/c086e72bd8aaeab37436515ab251b2df.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1561,11 +1365,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="A cubic curve mapped to canonical form" width="800" height="400" src="./chapters/canonical/interactive.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="800px" height="400px" src="images\chapters\canonical\83fe2473e20ea68b768765129ee44ae4.png">
-=======
-          <img width="800px" height="400px" src="images/chapters/canonical/83fe2473e20ea68b768765129ee44ae4.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1577,11 +1377,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Finding t, given x=x(t). Left: our curve, right: the function x=f(t)" width="550" height="275" src="./chapters/yforx/basics.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\yforx\dd28d64458d22f4fe89c98568258efcb.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/yforx/dd28d64458d22f4fe89c98568258efcb.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" class="slide-control">
@@ -1609,11 +1405,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Finding By(t), by finding t for a given x" width="275" height="275" src="./chapters/yforx/yforx.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\yforx\efcfe9b48ca4e65eef3d4bf3e4c97bc3.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/yforx/efcfe9b48ca4e65eef3d4bf3e4c97bc3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Finding By(t), by finding t for a given x</label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" class="slide-control">
@@ -1636,31 +1428,19 @@ y = curve.get(t).y</code></pre>
   <graphics-element title="A function's approximated integral" width="275" height="275" src="./chapters/arclength/draw-slices.js" data-steps="10">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclength\dc74a2f2da19470b8d721ece5f3ce268.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclength/dc74a2f2da19470b8d721ece5f3ce268.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A function's approximated integral</label>
         </fallback-image></graphics-element>
   <graphics-element title="A better approximation" width="275" height="275" src="./chapters/arclength/draw-slices.js" data-steps="24">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclength\4bffba7dda2a3556cf5b2ae7392083c6.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclength/4bffba7dda2a3556cf5b2ae7392083c6.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A better approximation</label>
         </fallback-image></graphics-element>
   <graphics-element title="An even better approximation" width="275" height="275" src="./chapters/arclength/draw-slices.js" data-steps="99">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclength\4b5d220d02b08f6c9aa19389255ef8bb.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclength/4b5d220d02b08f6c9aa19389255ef8bb.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>An even better approximation</label>
         </fallback-image></graphics-element>
 </div>
@@ -1684,11 +1464,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Arc length for a Bézier curve" width="275" height="275" src="./chapters/arclength/arclength.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclength\195f9a3c60f8dfe977c6450d21968f69.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclength/195f9a3c60f8dfe977c6450d21968f69.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Arc length for a Bézier curve</label>
         </fallback-image></graphics-element>
 
@@ -1702,11 +1478,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Approximate quadratic curve arc length" width="275" height="275" src="./chapters/arclengthapprox/approximate.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclengthapprox\a040f6b7c7c33ada25ecfd1060726545.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclengthapprox/a040f6b7c7c33ada25ecfd1060726545.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Approximate quadratic curve arc length</label>
         </fallback-image>
     <input type="range" min="2" max="24" step="1" value="4" class="slide-control">
@@ -1715,11 +1487,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Approximate cubic curve arc length" width="275" height="275" src="./chapters/arclengthapprox/approximate.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclengthapprox\c270144cc41e4ebc4b0b2331473530fa.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclengthapprox/c270144cc41e4ebc4b0b2331473530fa.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Approximate cubic curve arc length</label>
         </fallback-image>
     <input type="range" min="2" max="32" step="1" value="8" class="slide-control">
@@ -1767,11 +1535,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Matching curvatures for a quadratic and cubic Bézier curve" width="825" height="275" src="./chapters/curvature/curvature.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\curvature\5fcfb0572cae06717506c84768aa568c.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/curvature/5fcfb0572cae06717506c84768aa568c.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1781,11 +1545,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="(Easier) curvature matching for a quadratic and cubic Bézier curve" width="825" height="275" src="./chapters/curvature/curvature.js" data-omni="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\curvature\876d7b2750d7c29068ac6181c3634d25.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/curvature/876d7b2750d7c29068ac6181c3634d25.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="2" step="0.0005" value="0" class="slide-control">
@@ -1801,11 +1561,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="The t-for-distance function" width="550" height="275" src="./chapters/tracing/distance-function.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\tracing\52f815cefe99dabc47ca83d0b97b61fc.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/tracing/52f815cefe99dabc47ca83d0b97b61fc.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1814,11 +1570,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Fixed-interval coloring a curve" width="825" height="275" src="./chapters/tracing/tracing.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\tracing\09cfa54ec3709d54efdce78832e42367.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/tracing/09cfa54ec3709d54efdce78832e42367.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="2" max="24" step="1" value="8" class="slide-control">
@@ -1838,11 +1590,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Line/line intersections" width="275" height="275" src="./chapters/intersections/line-line.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\intersections\cab1799841eedd1dcd1cd81b6045f40f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/intersections/cab1799841eedd1dcd1cd81b6045f40f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Line/line intersections</label>
         </fallback-image></graphics-element>
 
@@ -1875,21 +1623,13 @@ lli = function(line1, line2):
 <graphics-element title="Quadratic curve/line intersections" width="275" height="275" src="./chapters/intersections/curve-line.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\intersections\7003a384ec371217af2b225ae65872e7.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/intersections/7003a384ec371217af2b225ae65872e7.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Quadratic curve/line intersections</label>
         </fallback-image></graphics-element>
 <graphics-element title="Cubic curve/line intersections" width="275" height="275" src="./chapters/intersections/curve-line.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\intersections\4a762fb56468c342c72756a76d134f05.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/intersections/4a762fb56468c342c72756a76d134f05.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Cubic curve/line intersections</label>
         </fallback-image></graphics-element>
 </div>
@@ -1917,11 +1657,7 @@ lli = function(line1, line2):
 <graphics-element title="Curve/curve intersections" width="825" height="275" src="./chapters/curveintersection/curve-curve.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\curveintersection\e1f4f4dba7a338d342559bcfb0ea8e02.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/curveintersection/e1f4f4dba7a338d342559bcfb0ea8e02.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <button class="next">Advance one step</button>
@@ -1942,11 +1678,7 @@ lli = function(line1, line2):
 <graphics-element inline={true} title="Projections in a quadratic Bézier curve" width="275" height="275" src="./chapters/abc/abc.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\abc\7a69dd4350ddda5701712e1d3b46b863.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/abc/7a69dd4350ddda5701712e1d3b46b863.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Projections in a quadratic Bézier curve</label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0.5" class="slide-control">
@@ -1954,11 +1686,7 @@ lli = function(line1, line2):
 <graphics-element inline={true} title="Projections in a cubic Bézier curve" width="275" height="275" src="./chapters/abc/abc.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\abc\eeec7cf16fb22c666e0143a3a030731f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/abc/eeec7cf16fb22c666e0143a3a030731f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Projections in a cubic Bézier curve</label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0.5" class="slide-control">
@@ -2006,11 +1734,7 @@ lli = function(line1, line2):
 <graphics-element title="Fitting a quadratic Bézier curve" width="275" height="275" src="./chapters/pointcurves/quadratic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointcurves\067a3df30e32708fc0d13f8eb78c0b05.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointcurves/067a3df30e32708fc0d13f8eb78c0b05.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Fitting a quadratic Bézier curve</label>
         </fallback-image></graphics-element>
 
@@ -2019,11 +1743,7 @@ lli = function(line1, line2):
 <graphics-element title="Finding a circle through three points" width="275" height="275" src="./chapters/pointcurves/circle.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointcurves\43875f6ad588bfd04cdb65b591a62052.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointcurves/43875f6ad588bfd04cdb65b591a62052.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Finding a circle through three points</label>
         </fallback-image></graphics-element>
 
@@ -2037,11 +1757,7 @@ lli = function(line1, line2):
 <graphics-element title="Finding the cubic e₁ and e₂ given three points " width="275" height="275" src="./chapters/pointcurves/circle.js" data-show-curve="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointcurves\75f7b5b31e98444e13f17e5c3e5b7322.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointcurves/75f7b5b31e98444e13f17e5c3e5b7322.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Finding the cubic e₁ and e₂ given three points </label>
         </fallback-image></graphics-element>
 
@@ -2049,11 +1765,7 @@ lli = function(line1, line2):
 <graphics-element title="Fitting a quadratic Bézier curve" width="275" height="275" src="./chapters/pointcurves/cubic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointcurves\eab6ea46fa93030e03ec0ef7deb571dc.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointcurves/eab6ea46fa93030e03ec0ef7deb571dc.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Fitting a quadratic Bézier curve</label>
         </fallback-image></graphics-element>
 
@@ -2083,11 +1795,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Projecting a point onto a Bézier curve" width="400" height="400" src="./chapters/projections/project.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\projections\3cc334d0ebc01cc5352e23ed47bc5414.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/projections/3cc334d0ebc01cc5352e23ed47bc5414.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2103,11 +1811,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Molding a quadratic Bézier curve" width="825" height="275" src="./chapters/molding/molding.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\molding\aefb177e5532a9f995b9d88e85582c68.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/molding/aefb177e5532a9f995b9d88e85582c68.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2116,11 +1820,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Molding a cubic Bézier curve" width="825" height="275" src="./chapters/molding/molding.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\molding\834af194de17a5eb2c1920773ab904e3.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/molding/834af194de17a5eb2c1920773ab904e3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2129,11 +1829,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Molding a cubic Bézier curve" width="825" height="275" src="./chapters/molding/molding.js" data-type="cubic" data-interpolated="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\molding\cdf7515d133cbf41ffbaea8c488e0924.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/molding/cdf7515d133cbf41ffbaea8c488e0924.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="10" max="200" step="1" value="100" class="slide-control">
@@ -2219,11 +1915,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Fitting a Bézier curve" width="550" height="275" src="./chapters/curvefitting/curve-fitting.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\curvefitting\798f3d7151dfb2887c7881a08e65cdd3.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/curvefitting/798f3d7151dfb2887c7881a08e65cdd3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <button class="toggle">toggle</button>
@@ -2240,11 +1932,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="A Catmull-Rom curve" width="275" height="275" src="./chapters/catmullconv/catmull-rom.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\catmullconv\aa46749b9469341d9249ca452390d875.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/catmullconv/aa46749b9469341d9249ca452390d875.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A Catmull-Rom curve</label>
         </fallback-image>
   <input type="range" min="0.1" max="1" step="0.01" value="0.5" class="slide-control tension">
@@ -2372,21 +2060,13 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Unlinked quadratic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="quadratic" data-link="coordinate">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\044f65dd588b0210499add16ea50a23d.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/044f65dd588b0210499add16ea50a23d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Unlinked quadratic poly-Bézier</label>
         </fallback-image></graphics-element>
 <graphics-element title="Unlinked cubic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="cubic" data-link="coordinate">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\babb27083b805c7c77bb93cfecbefb2b.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/babb27083b805c7c77bb93cfecbefb2b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Unlinked cubic poly-Bézier</label>
         </fallback-image></graphics-element>
 
@@ -2398,21 +2078,13 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Connected quadratic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="quadratic" data-link="derivative">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\b492c486c25f17a95c690e235b8ad483.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/b492c486c25f17a95c690e235b8ad483.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Connected quadratic poly-Bézier</label>
         </fallback-image></graphics-element>
 <graphics-element title="Connected cubic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="cubic" data-link="derivative">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\adc3b55c9956849ec86ecffcd8864d8a.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/adc3b55c9956849ec86ecffcd8864d8a.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Connected cubic poly-Bézier</label>
         </fallback-image></graphics-element>
 
@@ -2422,21 +2094,13 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Angularly connected quadratic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="quadratic" data-link="direction">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\17a6ffbfffaa9046ad165ca880d9030d.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/17a6ffbfffaa9046ad165ca880d9030d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Angularly connected quadratic poly-Bézier</label>
         </fallback-image></graphics-element>
 <graphics-element title="Angularly connected cubic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="cubic" data-link="direction">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\b7dfe772ac90d762f48772b691a9070f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/b7dfe772ac90d762f48772b691a9070f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Angularly connected cubic poly-Bézier</label>
         </fallback-image></graphics-element>
 
@@ -2445,21 +2109,13 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Standard connected quadratic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="quadratic" data-link="conventional">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\a1a3aabd22c0221beb38403a4532ea86.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/a1a3aabd22c0221beb38403a4532ea86.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Standard connected quadratic poly-Bézier</label>
         </fallback-image></graphics-element>
 <graphics-element title="Standard connected cubic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="cubic"  data-link="conventional">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\b810f02639a79cf7f8ae416d7185614d.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/b810f02639a79cf7f8ae416d7185614d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Standard connected cubic poly-Bézier</label>
         </fallback-image></graphics-element>
 
@@ -2499,11 +2155,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Offsetting a quadratic Bézier curve" width="275" height="275" src="./chapters/offsetting/offsetting.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\offsetting\768094c3c47d3888cf81e7a1d20d2eab.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/offsetting/768094c3c47d3888cf81e7a1d20d2eab.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Offsetting a quadratic Bézier curve</label>
         </fallback-image>
   <input type="range" min="5" max="50" step="1" value="20" class="slide-control">
@@ -2512,11 +2164,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Offsetting a cubic Bézier curve" width="275" height="275" src="./chapters/offsetting/offsetting.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\offsetting\1ad78f9f9d001278c491b0f2be5cc8ea.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/offsetting/1ad78f9f9d001278c491b0f2be5cc8ea.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Offsetting a cubic Bézier curve</label>
         </fallback-image>
   <input type="range" min="5" max="50" step="1" value="20" class="slide-control">
@@ -2540,11 +2188,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Offsetting a quadratic Bézier curve" width="275" height="275" src="./chapters/graduatedoffset/offsetting.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\graduatedoffset\8cc724d5343c65685d88c92b2d069a2a.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/graduatedoffset/8cc724d5343c65685d88c92b2d069a2a.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Offsetting a quadratic Bézier curve</label>
         </fallback-image>
   <input type="range" min="5" max="50" step="1" value="20" class="slide-control">
@@ -2553,11 +2197,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Offsetting a cubic Bézier curve" width="275" height="275" src="./chapters/graduatedoffset/offsetting.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\graduatedoffset\17bf62e05a1fc3387b0c210f2decff45.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/graduatedoffset/17bf62e05a1fc3387b0c210f2decff45.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Offsetting a cubic Bézier curve</label>
         </fallback-image>
   <input type="range" min="5" max="50" step="1" value="20" class="slide-control">
@@ -2574,11 +2214,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Quadratic Bézier arc approximation" width="400" height="400" src="./chapters/circles/arc-approximation.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\circles\5801de8227960faa9bcbae578f78c2a3.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/circles/5801de8227960faa9bcbae578f78c2a3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="-3.1415" max="3.1415" step="0.01" value="-0.7854" class="slide-control">
@@ -2635,11 +2271,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Cubic Bézier arc approximation" width="400" height="400" src="./chapters/circles_cubic/arc-approximation.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\circles_cubic\da768b84c91262bab8ab36f895e8569b.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/circles_cubic/da768b84c91262bab8ab36f895e8569b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="-3.1415" max="3.1415" step="0.01" value="-0.7854" class="slide-control">
@@ -2704,11 +2336,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Cubic Bézier circle approximation" width="340" height="300" src="./chapters/circles_cubic/circle.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="340px" height="300px" src="images\chapters\circles_cubic\63f35fb58d3571200ac6ccea0384b9d7.png">
-=======
-          <img width="340px" height="300px" src="images/chapters/circles_cubic/63f35fb58d3571200ac6ccea0384b9d7.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2749,11 +2377,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="First arc approximation of a Bézier curve" width="275" height="275" src="./chapters/arcapproximation/arc.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arcapproximation\7c9cce8142fa3e85bb124520f40645ff.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arcapproximation/7c9cce8142fa3e85bb124520f40645ff.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>First arc approximation of a Bézier curve</label>
         </fallback-image>
   <input type="range" min="0.1" max="5" step="0.1" value="0.5" class="slide-control">
@@ -2763,11 +2387,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Arc approximation of a Bézier curve" width="275" height="275" src="./chapters/arcapproximation/arcs.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arcapproximation\da76341b841df1af8a39f797e85dfe3c.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arcapproximation/da76341b841df1af8a39f797e85dfe3c.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Arc approximation of a Bézier curve</label>
         </fallback-image>
   <input type="range" min="0.1" max="5" step="0.1" value="0.5" class="slide-control">
@@ -2784,11 +2404,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="A B-Spline example" width="600" height="300" src="./chapters/bsplines/basic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="600px" height="300px" src="images\chapters\bsplines\fe3a8ca5706f286d916e36699e237e51.png">
-=======
-          <img width="600px" height="300px" src="images/chapters/bsplines/fe3a8ca5706f286d916e36699e237e51.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2802,11 +2418,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="The components of a B-Spline " width="600" height="300" src="./chapters/bsplines/basic.js" data-show-curves="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="600px" height="300px" src="images\chapters\bsplines\41167c64c51386414c6e62f0b45e6295.png">
-=======
-          <img width="600px" height="300px" src="images/chapters/bsplines/41167c64c51386414c6e62f0b45e6295.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- basis curve highlighter goes here -->
@@ -2872,11 +2484,7 @@ for(let L = 1; L &lt;= order; L++) {
 <graphics-element title="A uniform B-Spline" width="400" height="400" src="./chapters/bsplines/uniform.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\bsplines\48a30189e74658737b3a8b28bb816f8a.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/bsplines/48a30189e74658737b3a8b28bb816f8a.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- knot sliders go here -->
@@ -2889,11 +2497,7 @@ for(let L = 1; L &lt;= order; L++) {
 <graphics-element title="A reduced uniform B-Spline" width="400" height="400" src="./chapters/bsplines/reduced.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\bsplines\ceaef2fbee05a58aa11835925403b4cd.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/bsplines/ceaef2fbee05a58aa11835925403b4cd.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- knot sliders go here -->
@@ -2906,11 +2510,7 @@ for(let L = 1; L &lt;= order; L++) {
 <graphics-element title="An open, uniform B-Spline" width="400" height="400" src="./chapters/bsplines/uniform.js" data-open="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\bsplines\0215dc106e4ad51afe043c0176a595f6.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/bsplines/0215dc106e4ad51afe043c0176a595f6.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- knot sliders go here -->
@@ -2924,11 +2524,7 @@ for(let L = 1; L &lt;= order; L++) {
 <graphics-element title="A (closed) rational, uniform B-Spline" width="400" height="400" src="./chapters/bsplines/rational-uniform.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\bsplines\0d9c2186423466a32bb8fbd187409f82.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/bsplines/0d9c2186423466a32bb8fbd187409f82.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- knot sliders go here -->
@@ -2973,10 +2569,7 @@ for(let L = 1; L &lt;= order; L++) {
       Go do something cool with it!
     </footer>
 
-<<<<<<< HEAD
     <!-- fix firefox's scroll position algorithm. Due to how it works, it cannot be async/defer -->
-=======
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
     <script src="./js/site/fix-scroll.js"></script>
   </body>
 </html>
diff --git a/docs/ja-JP/index.html b/docs/ja-JP/index.html
index 8b86fdc6..05ffc7f1 100644
--- a/docs/ja-JP/index.html
+++ b/docs/ja-JP/index.html
@@ -14,7 +14,6 @@
     <link rel="stylesheet" href="placeholder-style.css" />
 
     <!-- And a slew of SEO related meta elements, because being discoverable is important -->
-<<<<<<< HEAD
 <meta name="description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
 
 <!-- opengraph information -->
@@ -37,30 +36,6 @@
 <meta name="twitter:image" content="https://pomax.github.io/bezierinfo/images/og-image.png" />
 <meta name="twitter:url" content="https://pomax.github.io/bezierinfo" />
 <meta name="twitter:description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
-=======
-    <meta name="description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
-
-    <!-- opengraph information -->
-    <meta property="og:title" content="ベジェ曲線入門" />
-    <meta property="og:image" content="https://pomax.github.io/bezierinfo/images/og-image.png" />
-    <meta property="og:type" content="text" />
-    <meta property="og:url" content="https://pomax.github.io/bezierinfo" />
-    <meta property="og:description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
-    <meta property="og:locale" content="ja-JP}}" />
-    <meta property="og:type" content="article" />
-    <meta property="og:published_time" content="2013-06-13 12:00:00" />
-    <meta property="og:author" content="Mike 'Pomax' Kamermans" />
-    <meta property="og:section" content="Bézier Curves" />
-    <meta property="og:tag" content="Bézier Curves" />
-
-    <!-- twitter card information -->
-    <meta name="twitter:card" content="summary" />
-    <meta name="twitter:site" content="@TheRealPomax" />
-    <meta name="twitter:creator" content="@TheRealPomax" />
-    <meta name="twitter:image" content="https://pomax.github.io/bezierinfo/images/og-image.png" />
-    <meta name="twitter:url" content="https://pomax.github.io/bezierinfo" />
-    <meta name="twitter:description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
 
     <!-- my own referral/page hit tracker, because Google knows enough -->
     <script src="./js/site/referrer.js" type="module" async></script>
@@ -79,7 +54,6 @@
   </head>
 
   <body>
-<<<<<<< HEAD
     <div class="dev" style="display:none;">
     DEV PREVIEW ONLY
     <script>
@@ -122,20 +96,11 @@
       <h1>ベジェ曲線入門</h1>
       <h2>A free, online book for when you really need to know how to do Bézier things.</h2>
       <span>Read this in your own language:</span>
-=======
-    <header>
-      <h1>ベジェ曲線入門</h1>
-      <h2>A free, online book for when you really need to know how to do Bézier things.</h2>
-
-      <span>Read this in your own language:</span>
-
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
       <ul class="lang-switcher">
         <li><a href="./index.html">English</a></li>
 <li><a href="./ja-JP/index.html">日本語</a></li>
 <li><a href="./zh-CN/index.html">中文</a></li>
       </ul>
-<<<<<<< HEAD
       <p>Don't see your language listed? <a href="https://github.com/Pomax/BezierInfo-2/wiki/localize">Help translate this content!</a></p>
 
       <noscript>
@@ -146,32 +111,13 @@
         </header>
 
         <p>
-=======
-
-      <p>Don't see your language listed? <a href="https://github.com/Pomax/BezierInfo-2/wiki/localize">Help translate this content!</a></p>
-
-      <noscript>
-        <div class="note">
-          <header>
-            <h2>This site (obviously) works best with JS enabled</h2>
-            <h3>But it's not required.</h3>
-          </header>
-
-          <p>
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
             If you can read this &lt;noscript&gt; content, you have scripts disabled: thankfully,
             this site is not going to force you to turn it on just to see any content. Everything
             will work just fine, you can still read the text, navigate to sections, and see the
             graphics that are used to illustrate the concepts that individual sections talk about.
-<<<<<<< HEAD
         </p>
 
         <p>
-=======
-          </p>
-
-          <p>
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
             <strong>However</strong>, a big part of this primer's experience is the fact that all
             graphics are interactive, and for that to work, HTML Custom Elements need to work,
             which requires Javascript to be enabled. If anything, you'll probably want to allow
@@ -182,15 +128,9 @@
             lets me see who's linking to the primer, which you probably don't care about, but lets
             me strike up conversations with folks who I would otherwise never know thought the
             primer was worth linking to, and I like talking to people who care enough to link)
-<<<<<<< HEAD
         </p>
     </div>
 </noscript>
-=======
-          </p>
-        </div>
-      </noscript>
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
 
       <nav aria-labelledby="toc">
         <h1 id="toc">目次</h1>
@@ -277,17 +217,9 @@
       <section id="changelog">
         <h1>What's new?</h1>
         <p>This primer is a living document, and so depending on when you last look at it, there may be new content. Click the following link to expand this section to have a look at what got added, when.</p>
-<<<<<<< HEAD
         <!-- non-JS content reveals are nice -->
         <label for="changelogtoggle">Toggle changes</label>
         <input type="checkbox" id="changelogtoggle">
-=======
-
-        <!-- non-JS content reveals are nice -->
-        <label for="changelogtoggle">Toggle changes</label>
-        <input type="checkbox" id="changelogtoggle">
-
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
         <section><h2>August-September 2020</h2><ul><li>Completely overhauled the site: the Primer is now a normal web page that works fine with JS disabled, but obviously better with JS turned on.</li></ul>
 <h2>June 2020</h2><ul><li>Added automatic CI/CD using Github Actions</li></ul>
 <h2>January 2020</h2><ul><li>Added reset buttons to all graphics</li>
@@ -337,21 +269,13 @@
   <graphics-element title="2次のベジエ曲線" width="275" height="275" src="./chapters/introduction/quadratic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\introduction\54e9ec0600ac436b0e6f0c6b5005cf03.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/introduction/54e9ec0600ac436b0e6f0c6b5005cf03.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>2次のベジエ曲線</label>
         </fallback-image></graphics-element>
   <graphics-element title="3次のベジエ曲線" width="275" height="275" src="./chapters/introduction/cubic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\introduction\8d158a13e9a86969b99c64057644cbc6.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/introduction/8d158a13e9a86969b99c64057644cbc6.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>3次のベジエ曲線</label>
         </fallback-image></graphics-element>
 </div>
@@ -369,11 +293,7 @@
 <graphics-element title="Linear Interpolation leading to Bézier curves" width="825" height="275" src="./chapters/whatis/interpolation.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
-          <img width="825px" height="275px" src="images\chapters\whatis\9b3633889c38325c24c19ce18ab94ad6.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/whatis/524dd296e96c0fe2281fb95146f8ea65.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
+          <img width="825px" height="275px" src="images\chapters\whatis\524dd296e96c0fe2281fb95146f8ea65.png">
           <label></label>
         </fallback-image>
   <input type="range" min="10" max="90" step="1" value="25" class="slide-control">
@@ -400,11 +320,7 @@
 <graphics-element title="（部分）円 x=sin(t), y=cos(t)" width="275" height="275" src="./chapters/explanation/circle.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\explanation\6d2f915735ebdc05e42c0ea7adc85343.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/explanation/6d2f915735ebdc05e42c0ea7adc85343.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>（部分）円 x=sin(t), y=cos(t)</label>
         </fallback-image>
   <input type="range" min="0" max="10" step="0.1" value="5" class="slide-control">
@@ -487,11 +403,7 @@ function Bezier(3,t):
   <graphics-element title="2次の補間" width="275" height="275" src="./chapters/control/lerp.js" data-degree="3">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\control\2a0635829051977b265b64ef204f718e.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/control/2a0635829051977b265b64ef204f718e.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>2次の補間</label>
         </fallback-image>
     <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -500,11 +412,7 @@ function Bezier(3,t):
   <graphics-element title="3次の補間" width="275" height="275" src="./chapters/control/lerp.js" data-degree="4">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\control\fca18b2602929f80e68d8964832f0f44.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/control/fca18b2602929f80e68d8964832f0f44.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>3次の補間</label>
         </fallback-image>
     <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -513,11 +421,7 @@ function Bezier(3,t):
   <graphics-element title="15次の補間" width="275" height="275" src="./chapters/control/lerp.js" data-degree="15">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\control\989f4ca49d7099802cc0345dbeddca8c.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/control/989f4ca49d7099802cc0345dbeddca8c.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>15次の補間</label>
         </fallback-image>
     <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -574,11 +478,7 @@ function Bezier(3,t,w[]):
 <graphics-element title="Our rational cubic Bézier curve" width="275" height="275" src="./chapters/weightcontrol/rational.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\weightcontrol\be18e8119472af796329f3e2159bdf94.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/weightcontrol/be18e8119472af796329f3e2159bdf94.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Our rational cubic Bézier curve</label>
         </fallback-image>
   <input type="range" min="0.01" max="2" value="1" step="0.01" class="ratio-1">
@@ -637,21 +537,13 @@ function RationalBezier(3,t,w[],r[]):
 <graphics-element title="無限区間の2次ベジエ曲線" width="275" height="275" src="./chapters/extended/extended.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\extended\391a61142c56b79260680aefb08cd9c4.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/extended/391a61142c56b79260680aefb08cd9c4.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>無限区間の2次ベジエ曲線</label>
         </fallback-image></graphics-element>
 <graphics-element title="無限区間の3次ベジエ曲線" width="275" height="275" src="./chapters/extended/extended.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\extended\baeceec6e1587794b8b275a90d5d85e9.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/extended/baeceec6e1587794b8b275a90d5d85e9.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>無限区間の3次ベジエ曲線</label>
         </fallback-image></graphics-element>
 </div>
@@ -704,11 +596,7 @@ function RationalBezier(3,t,w[],r[]):
 <graphics-element title="ド・カステリョのアルゴリズムで曲線をたどる" width="275" height="275" src="./chapters/decasteljau/decasteljau.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\decasteljau\715d1d2eecc762d6bc1470954b145018.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/decasteljau/715d1d2eecc762d6bc1470954b145018.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>ド・カステリョのアルゴリズムで曲線をたどる</label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -749,11 +637,7 @@ function RationalBezier(3,t,w[],r[]):
   <graphics-element title="2次ベジエ曲線の平坦化" width="275" height="275" src="./chapters/flattening/flatten.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\flattening\3deec756c96e53127cd1d615c61043ae.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/flattening/3deec756c96e53127cd1d615c61043ae.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>2次ベジエ曲線の平坦化</label>
         </fallback-image>
     <input type="range" min="1" max="16" step="1" value="4" class="slide-control">
@@ -762,11 +646,7 @@ function RationalBezier(3,t,w[],r[]):
   <graphics-element title="3次ベジエ曲線の平坦化" width="275" height="275" src="./chapters/flattening/flatten.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\flattening\e2bb7113d5cda2e3fd29bbc54fbe8841.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/flattening/e2bb7113d5cda2e3fd29bbc54fbe8841.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>3次ベジエ曲線の平坦化</label>
         </fallback-image>
     <input type="range" min="1" max="24" step="1" value="8" class="slide-control">
@@ -803,11 +683,7 @@ function RationalBezier(3,t,w[],r[]):
 <graphics-element title="曲線の分割" width="825" height="275" src="./chapters/splitting/splitting.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\splitting\891133c5f0e140b8c7e179af04e497e0.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/splitting/891133c5f0e140b8c7e179af04e497e0.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0.5" class="slide-control">
@@ -931,11 +807,7 @@ function drawCurve(points[], t):
 <graphics-element title="A variable-order Bézier curve" width="275" height="275" src="./chapters/reordering/reorder.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\reordering\71f47629388901b821976e034be159e4.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/reordering/71f47629388901b821976e034be159e4.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A variable-order Bézier curve</label>
         </fallback-image>
   <button class="raise">raise</button>
@@ -1011,21 +883,13 @@ treated as a sequence of three (elementary) shear operations. When we combine th
   <graphics-element title="Quadratic Bézier tangents and normals" width="275" height="275" src="./chapters/pointvectors/pointvectors.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointvectors\f4d72cc162d4cbcc6d6a459fced01cfb.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointvectors/f4d72cc162d4cbcc6d6a459fced01cfb.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Quadratic Bézier tangents and normals</label>
         </fallback-image></graphics-element>
   <graphics-element title="Cubic Bézier tangents and normals" width="275" height="275" src="./chapters/pointvectors/pointvectors.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointvectors\2724b6c42f36b4dbea6962cac844d2c3.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointvectors/2724b6c42f36b4dbea6962cac844d2c3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Cubic Bézier tangents and normals</label>
         </fallback-image></graphics-element>
 </div>
@@ -1055,11 +919,7 @@ treated as a sequence of three (elementary) shear operations. When we combine th
 <graphics-element title="Some known and unknown vectors" width="350" height="300" src="./chapters/pointvectors3d/frenet.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="350px" height="300px" src="images\chapters\pointvectors3d\59b6ce3fcbf79da171d86e962597097e.png">
-=======
-          <img width="350px" height="300px" src="images/chapters/pointvectors3d/59b6ce3fcbf79da171d86e962597097e.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -1134,11 +994,7 @@ treated as a sequence of three (elementary) shear operations. When we combine th
 <graphics-element title="Some known and unknown vectors" width="350" height="300" src="./chapters/pointvectors3d/rotation-minimizing.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="350px" height="300px" src="images\chapters\pointvectors3d\9983328e50c2156c124bb1ea4ad5c05b.png">
-=======
-          <img width="350px" height="300px" src="images/chapters/pointvectors3d/9983328e50c2156c124bb1ea4ad5c05b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -1157,22 +1013,14 @@ treated as a sequence of three (elementary) shear operations. When we combine th
 <graphics-element title="Quadratic Bézier curve components" width="825" height="275" src="./chapters/components/components.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\components\008604bc4c53bd7e0d97c99a67812ad1.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/components/008604bc4c53bd7e0d97c99a67812ad1.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
 <graphics-element title="Cubic Bézier curve components" width="825" height="275" src="./chapters/components/components.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\components\5214256129e6396e7ac1f1713fa9c88d.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/components/5214256129e6396e7ac1f1713fa9c88d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1309,11 +1157,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Quadratic Bézier curve extremities" width="825" height="275" src="./chapters/extremities/extremities.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\extremities\9850eec01924deae7fda4400ce44270d.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/extremities/9850eec01924deae7fda4400ce44270d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1321,11 +1165,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Cubic Bézier curve extremities" width="825" height="275" src="./chapters/extremities/extremities.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\extremities\890406c7bc96904224f8f14940bf3e56.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/extremities/890406c7bc96904224f8f14940bf3e56.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1344,21 +1184,13 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Quadratic Bézier bounding box" width="275" height="275" src="./chapters/boundingbox/bbox.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\boundingbox\e2c621442e98e2cd20af7efe1cfb041f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/boundingbox/e2c621442e98e2cd20af7efe1cfb041f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Quadratic Bézier bounding box</label>
         </fallback-image></graphics-element>
 <graphics-element title="Cubic Bézier bounding box" width="275" height="275" src="./chapters/boundingbox/bbox.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\boundingbox\f8989a62ebec9d6f123291c146caab5b.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/boundingbox/f8989a62ebec9d6f123291c146caab5b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Cubic Bézier bounding box</label>
         </fallback-image></graphics-element>
 </div>
@@ -1382,21 +1214,13 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Aligning a quadratic curve" width="550" height="275" src="./chapters/aligning/aligning.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\aligning\b3ccd45a72c815388aee6515fe37a486.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/aligning/b3ccd45a72c815388aee6515fe37a486.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 <graphics-element title="Aligning a cubic curve" width="550" height="275" src="./chapters/aligning/aligning.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\aligning\31655f24b7dd8b8871687b6610d9ac0e.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/aligning/31655f24b7dd8b8871687b6610d9ac0e.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 </div>
@@ -1410,21 +1234,13 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Aligning a quadratic curve" width="275" height="275" src="./chapters/tightbounds/tightbounds.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\tightbounds\ccc77ae1f57d7dd7ce4d5397fe1b140b.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/tightbounds/ccc77ae1f57d7dd7ce4d5397fe1b140b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Aligning a quadratic curve</label>
         </fallback-image></graphics-element>
 <graphics-element title="Aligning a cubic curve" width="275" height="275" src="./chapters/tightbounds/tightbounds.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\tightbounds\419415bee6ffd7598c035c42de09a94f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/tightbounds/419415bee6ffd7598c035c42de09a94f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Aligning a cubic curve</label>
         </fallback-image></graphics-element>
 </div>
@@ -1465,11 +1281,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Finding cubic Bézier curve inflections" width="275" height="275" src="./chapters/inflections/inflection.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\inflections\9e1ce3975100600d4979370851929b73.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/inflections/9e1ce3975100600d4979370851929b73.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Finding cubic Bézier curve inflections</label>
         </fallback-image></graphics-element>
 
@@ -1482,11 +1294,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="The canonical curve map" width="400" height="400" src="./chapters/canonical/canonical.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\canonical\c086e72bd8aaeab37436515ab251b2df.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/canonical/c086e72bd8aaeab37436515ab251b2df.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1553,11 +1361,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="A cubic curve mapped to canonical form" width="800" height="400" src="./chapters/canonical/interactive.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="800px" height="400px" src="images\chapters\canonical\83fe2473e20ea68b768765129ee44ae4.png">
-=======
-          <img width="800px" height="400px" src="images/chapters/canonical/83fe2473e20ea68b768765129ee44ae4.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1569,11 +1373,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Finding t, given x=x(t). Left: our curve, right: the function x=f(t)" width="550" height="275" src="./chapters/yforx/basics.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\yforx\dd28d64458d22f4fe89c98568258efcb.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/yforx/dd28d64458d22f4fe89c98568258efcb.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" class="slide-control">
@@ -1601,11 +1401,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Finding By(t), by finding t for a given x" width="275" height="275" src="./chapters/yforx/yforx.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\yforx\efcfe9b48ca4e65eef3d4bf3e4c97bc3.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/yforx/efcfe9b48ca4e65eef3d4bf3e4c97bc3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Finding By(t), by finding t for a given x</label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" class="slide-control">
@@ -1628,31 +1424,19 @@ y = curve.get(t).y</code></pre>
   <graphics-element title="A function's approximated integral" width="275" height="275" src="./chapters/arclength/draw-slices.js" data-steps="10">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclength\dc74a2f2da19470b8d721ece5f3ce268.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclength/dc74a2f2da19470b8d721ece5f3ce268.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A function's approximated integral</label>
         </fallback-image></graphics-element>
   <graphics-element title="A better approximation" width="275" height="275" src="./chapters/arclength/draw-slices.js" data-steps="24">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclength\4bffba7dda2a3556cf5b2ae7392083c6.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclength/4bffba7dda2a3556cf5b2ae7392083c6.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A better approximation</label>
         </fallback-image></graphics-element>
   <graphics-element title="An even better approximation" width="275" height="275" src="./chapters/arclength/draw-slices.js" data-steps="99">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclength\4b5d220d02b08f6c9aa19389255ef8bb.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclength/4b5d220d02b08f6c9aa19389255ef8bb.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>An even better approximation</label>
         </fallback-image></graphics-element>
 </div>
@@ -1676,11 +1460,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Arc length for a Bézier curve" width="275" height="275" src="./chapters/arclength/arclength.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclength\195f9a3c60f8dfe977c6450d21968f69.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclength/195f9a3c60f8dfe977c6450d21968f69.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Arc length for a Bézier curve</label>
         </fallback-image></graphics-element>
 
@@ -1694,11 +1474,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Approximate quadratic curve arc length" width="275" height="275" src="./chapters/arclengthapprox/approximate.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclengthapprox\a040f6b7c7c33ada25ecfd1060726545.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclengthapprox/a040f6b7c7c33ada25ecfd1060726545.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Approximate quadratic curve arc length</label>
         </fallback-image>
     <input type="range" min="2" max="24" step="1" value="4" class="slide-control">
@@ -1707,11 +1483,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Approximate cubic curve arc length" width="275" height="275" src="./chapters/arclengthapprox/approximate.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclengthapprox\c270144cc41e4ebc4b0b2331473530fa.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclengthapprox/c270144cc41e4ebc4b0b2331473530fa.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Approximate cubic curve arc length</label>
         </fallback-image>
     <input type="range" min="2" max="32" step="1" value="8" class="slide-control">
@@ -1759,11 +1531,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Matching curvatures for a quadratic and cubic Bézier curve" width="825" height="275" src="./chapters/curvature/curvature.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\curvature\5fcfb0572cae06717506c84768aa568c.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/curvature/5fcfb0572cae06717506c84768aa568c.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1773,11 +1541,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="(Easier) curvature matching for a quadratic and cubic Bézier curve" width="825" height="275" src="./chapters/curvature/curvature.js" data-omni="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\curvature\876d7b2750d7c29068ac6181c3634d25.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/curvature/876d7b2750d7c29068ac6181c3634d25.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="2" step="0.0005" value="0" class="slide-control">
@@ -1793,11 +1557,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="The t-for-distance function" width="550" height="275" src="./chapters/tracing/distance-function.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\tracing\52f815cefe99dabc47ca83d0b97b61fc.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/tracing/52f815cefe99dabc47ca83d0b97b61fc.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1806,11 +1566,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Fixed-interval coloring a curve" width="825" height="275" src="./chapters/tracing/tracing.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\tracing\09cfa54ec3709d54efdce78832e42367.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/tracing/09cfa54ec3709d54efdce78832e42367.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="2" max="24" step="1" value="8" class="slide-control">
@@ -1830,11 +1586,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Line/line intersections" width="275" height="275" src="./chapters/intersections/line-line.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\intersections\cab1799841eedd1dcd1cd81b6045f40f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/intersections/cab1799841eedd1dcd1cd81b6045f40f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Line/line intersections</label>
         </fallback-image></graphics-element>
 
@@ -1867,21 +1619,13 @@ lli = function(line1, line2):
 <graphics-element title="Quadratic curve/line intersections" width="275" height="275" src="./chapters/intersections/curve-line.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\intersections\7003a384ec371217af2b225ae65872e7.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/intersections/7003a384ec371217af2b225ae65872e7.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Quadratic curve/line intersections</label>
         </fallback-image></graphics-element>
 <graphics-element title="Cubic curve/line intersections" width="275" height="275" src="./chapters/intersections/curve-line.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\intersections\4a762fb56468c342c72756a76d134f05.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/intersections/4a762fb56468c342c72756a76d134f05.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Cubic curve/line intersections</label>
         </fallback-image></graphics-element>
 </div>
@@ -1909,11 +1653,7 @@ lli = function(line1, line2):
 <graphics-element title="Curve/curve intersections" width="825" height="275" src="./chapters/curveintersection/curve-curve.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\curveintersection\e1f4f4dba7a338d342559bcfb0ea8e02.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/curveintersection/e1f4f4dba7a338d342559bcfb0ea8e02.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <button class="next">Advance one step</button>
@@ -1934,11 +1674,7 @@ lli = function(line1, line2):
 <graphics-element inline={true} title="Projections in a quadratic Bézier curve" width="275" height="275" src="./chapters/abc/abc.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\abc\7a69dd4350ddda5701712e1d3b46b863.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/abc/7a69dd4350ddda5701712e1d3b46b863.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Projections in a quadratic Bézier curve</label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0.5" class="slide-control">
@@ -1946,11 +1682,7 @@ lli = function(line1, line2):
 <graphics-element inline={true} title="Projections in a cubic Bézier curve" width="275" height="275" src="./chapters/abc/abc.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\abc\eeec7cf16fb22c666e0143a3a030731f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/abc/eeec7cf16fb22c666e0143a3a030731f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Projections in a cubic Bézier curve</label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0.5" class="slide-control">
@@ -1998,11 +1730,7 @@ lli = function(line1, line2):
 <graphics-element title="Fitting a quadratic Bézier curve" width="275" height="275" src="./chapters/pointcurves/quadratic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointcurves\067a3df30e32708fc0d13f8eb78c0b05.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointcurves/067a3df30e32708fc0d13f8eb78c0b05.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Fitting a quadratic Bézier curve</label>
         </fallback-image></graphics-element>
 
@@ -2011,11 +1739,7 @@ lli = function(line1, line2):
 <graphics-element title="Finding a circle through three points" width="275" height="275" src="./chapters/pointcurves/circle.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointcurves\43875f6ad588bfd04cdb65b591a62052.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointcurves/43875f6ad588bfd04cdb65b591a62052.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Finding a circle through three points</label>
         </fallback-image></graphics-element>
 
@@ -2029,11 +1753,7 @@ lli = function(line1, line2):
 <graphics-element title="Finding the cubic e₁ and e₂ given three points " width="275" height="275" src="./chapters/pointcurves/circle.js" data-show-curve="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointcurves\75f7b5b31e98444e13f17e5c3e5b7322.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointcurves/75f7b5b31e98444e13f17e5c3e5b7322.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Finding the cubic e₁ and e₂ given three points </label>
         </fallback-image></graphics-element>
 
@@ -2041,11 +1761,7 @@ lli = function(line1, line2):
 <graphics-element title="Fitting a quadratic Bézier curve" width="275" height="275" src="./chapters/pointcurves/cubic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointcurves\eab6ea46fa93030e03ec0ef7deb571dc.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointcurves/eab6ea46fa93030e03ec0ef7deb571dc.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Fitting a quadratic Bézier curve</label>
         </fallback-image></graphics-element>
 
@@ -2075,11 +1791,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Projecting a point onto a Bézier curve" width="400" height="400" src="./chapters/projections/project.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\projections\3cc334d0ebc01cc5352e23ed47bc5414.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/projections/3cc334d0ebc01cc5352e23ed47bc5414.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2095,11 +1807,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Molding a quadratic Bézier curve" width="825" height="275" src="./chapters/molding/molding.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\molding\aefb177e5532a9f995b9d88e85582c68.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/molding/aefb177e5532a9f995b9d88e85582c68.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2108,11 +1816,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Molding a cubic Bézier curve" width="825" height="275" src="./chapters/molding/molding.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\molding\834af194de17a5eb2c1920773ab904e3.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/molding/834af194de17a5eb2c1920773ab904e3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2121,11 +1825,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Molding a cubic Bézier curve" width="825" height="275" src="./chapters/molding/molding.js" data-type="cubic" data-interpolated="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\molding\cdf7515d133cbf41ffbaea8c488e0924.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/molding/cdf7515d133cbf41ffbaea8c488e0924.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="10" max="200" step="1" value="100" class="slide-control">
@@ -2211,11 +1911,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Fitting a Bézier curve" width="550" height="275" src="./chapters/curvefitting/curve-fitting.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\curvefitting\798f3d7151dfb2887c7881a08e65cdd3.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/curvefitting/798f3d7151dfb2887c7881a08e65cdd3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <button class="toggle">toggle</button>
@@ -2232,11 +1928,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="A Catmull-Rom curve" width="275" height="275" src="./chapters/catmullconv/catmull-rom.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\catmullconv\aa46749b9469341d9249ca452390d875.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/catmullconv/aa46749b9469341d9249ca452390d875.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A Catmull-Rom curve</label>
         </fallback-image>
   <input type="range" min="0.1" max="1" step="0.01" value="0.5" class="slide-control tension">
@@ -2364,21 +2056,13 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Unlinked quadratic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="quadratic" data-link="coordinate">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\044f65dd588b0210499add16ea50a23d.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/044f65dd588b0210499add16ea50a23d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Unlinked quadratic poly-Bézier</label>
         </fallback-image></graphics-element>
 <graphics-element title="Unlinked cubic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="cubic" data-link="coordinate">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\babb27083b805c7c77bb93cfecbefb2b.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/babb27083b805c7c77bb93cfecbefb2b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Unlinked cubic poly-Bézier</label>
         </fallback-image></graphics-element>
 
@@ -2390,21 +2074,13 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Connected quadratic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="quadratic" data-link="derivative">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\b492c486c25f17a95c690e235b8ad483.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/b492c486c25f17a95c690e235b8ad483.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Connected quadratic poly-Bézier</label>
         </fallback-image></graphics-element>
 <graphics-element title="Connected cubic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="cubic" data-link="derivative">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\adc3b55c9956849ec86ecffcd8864d8a.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/adc3b55c9956849ec86ecffcd8864d8a.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Connected cubic poly-Bézier</label>
         </fallback-image></graphics-element>
 
@@ -2414,21 +2090,13 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Angularly connected quadratic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="quadratic" data-link="direction">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\17a6ffbfffaa9046ad165ca880d9030d.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/17a6ffbfffaa9046ad165ca880d9030d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Angularly connected quadratic poly-Bézier</label>
         </fallback-image></graphics-element>
 <graphics-element title="Angularly connected cubic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="cubic" data-link="direction">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\b7dfe772ac90d762f48772b691a9070f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/b7dfe772ac90d762f48772b691a9070f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Angularly connected cubic poly-Bézier</label>
         </fallback-image></graphics-element>
 
@@ -2437,21 +2105,13 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Standard connected quadratic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="quadratic" data-link="conventional">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\a1a3aabd22c0221beb38403a4532ea86.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/a1a3aabd22c0221beb38403a4532ea86.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Standard connected quadratic poly-Bézier</label>
         </fallback-image></graphics-element>
 <graphics-element title="Standard connected cubic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="cubic"  data-link="conventional">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\b810f02639a79cf7f8ae416d7185614d.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/b810f02639a79cf7f8ae416d7185614d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Standard connected cubic poly-Bézier</label>
         </fallback-image></graphics-element>
 
@@ -2491,11 +2151,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Offsetting a quadratic Bézier curve" width="275" height="275" src="./chapters/offsetting/offsetting.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\offsetting\768094c3c47d3888cf81e7a1d20d2eab.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/offsetting/768094c3c47d3888cf81e7a1d20d2eab.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Offsetting a quadratic Bézier curve</label>
         </fallback-image>
   <input type="range" min="5" max="50" step="1" value="20" class="slide-control">
@@ -2504,11 +2160,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Offsetting a cubic Bézier curve" width="275" height="275" src="./chapters/offsetting/offsetting.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\offsetting\1ad78f9f9d001278c491b0f2be5cc8ea.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/offsetting/1ad78f9f9d001278c491b0f2be5cc8ea.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Offsetting a cubic Bézier curve</label>
         </fallback-image>
   <input type="range" min="5" max="50" step="1" value="20" class="slide-control">
@@ -2532,11 +2184,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Offsetting a quadratic Bézier curve" width="275" height="275" src="./chapters/graduatedoffset/offsetting.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\graduatedoffset\8cc724d5343c65685d88c92b2d069a2a.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/graduatedoffset/8cc724d5343c65685d88c92b2d069a2a.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Offsetting a quadratic Bézier curve</label>
         </fallback-image>
   <input type="range" min="5" max="50" step="1" value="20" class="slide-control">
@@ -2545,11 +2193,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Offsetting a cubic Bézier curve" width="275" height="275" src="./chapters/graduatedoffset/offsetting.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\graduatedoffset\17bf62e05a1fc3387b0c210f2decff45.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/graduatedoffset/17bf62e05a1fc3387b0c210f2decff45.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Offsetting a cubic Bézier curve</label>
         </fallback-image>
   <input type="range" min="5" max="50" step="1" value="20" class="slide-control">
@@ -2566,11 +2210,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Quadratic Bézier arc approximation" width="400" height="400" src="./chapters/circles/arc-approximation.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\circles\5801de8227960faa9bcbae578f78c2a3.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/circles/5801de8227960faa9bcbae578f78c2a3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="-3.1415" max="3.1415" step="0.01" value="-0.7854" class="slide-control">
@@ -2627,11 +2267,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Cubic Bézier arc approximation" width="400" height="400" src="./chapters/circles_cubic/arc-approximation.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\circles_cubic\da768b84c91262bab8ab36f895e8569b.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/circles_cubic/da768b84c91262bab8ab36f895e8569b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="-3.1415" max="3.1415" step="0.01" value="-0.7854" class="slide-control">
@@ -2696,11 +2332,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Cubic Bézier circle approximation" width="340" height="300" src="./chapters/circles_cubic/circle.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="340px" height="300px" src="images\chapters\circles_cubic\63f35fb58d3571200ac6ccea0384b9d7.png">
-=======
-          <img width="340px" height="300px" src="images/chapters/circles_cubic/63f35fb58d3571200ac6ccea0384b9d7.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2741,11 +2373,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="First arc approximation of a Bézier curve" width="275" height="275" src="./chapters/arcapproximation/arc.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arcapproximation\7c9cce8142fa3e85bb124520f40645ff.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arcapproximation/7c9cce8142fa3e85bb124520f40645ff.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>First arc approximation of a Bézier curve</label>
         </fallback-image>
   <input type="range" min="0.1" max="5" step="0.1" value="0.5" class="slide-control">
@@ -2755,11 +2383,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Arc approximation of a Bézier curve" width="275" height="275" src="./chapters/arcapproximation/arcs.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arcapproximation\da76341b841df1af8a39f797e85dfe3c.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arcapproximation/da76341b841df1af8a39f797e85dfe3c.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Arc approximation of a Bézier curve</label>
         </fallback-image>
   <input type="range" min="0.1" max="5" step="0.1" value="0.5" class="slide-control">
@@ -2776,11 +2400,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="A B-Spline example" width="600" height="300" src="./chapters/bsplines/basic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="600px" height="300px" src="images\chapters\bsplines\fe3a8ca5706f286d916e36699e237e51.png">
-=======
-          <img width="600px" height="300px" src="images/chapters/bsplines/fe3a8ca5706f286d916e36699e237e51.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2794,11 +2414,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="The components of a B-Spline " width="600" height="300" src="./chapters/bsplines/basic.js" data-show-curves="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="600px" height="300px" src="images\chapters\bsplines\41167c64c51386414c6e62f0b45e6295.png">
-=======
-          <img width="600px" height="300px" src="images/chapters/bsplines/41167c64c51386414c6e62f0b45e6295.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- basis curve highlighter goes here -->
@@ -2864,11 +2480,7 @@ for(let L = 1; L &lt;= order; L++) {
 <graphics-element title="A uniform B-Spline" width="400" height="400" src="./chapters/bsplines/uniform.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\bsplines\48a30189e74658737b3a8b28bb816f8a.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/bsplines/48a30189e74658737b3a8b28bb816f8a.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- knot sliders go here -->
@@ -2881,11 +2493,7 @@ for(let L = 1; L &lt;= order; L++) {
 <graphics-element title="A reduced uniform B-Spline" width="400" height="400" src="./chapters/bsplines/reduced.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\bsplines\ceaef2fbee05a58aa11835925403b4cd.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/bsplines/ceaef2fbee05a58aa11835925403b4cd.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- knot sliders go here -->
@@ -2898,11 +2506,7 @@ for(let L = 1; L &lt;= order; L++) {
 <graphics-element title="An open, uniform B-Spline" width="400" height="400" src="./chapters/bsplines/uniform.js" data-open="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\bsplines\0215dc106e4ad51afe043c0176a595f6.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/bsplines/0215dc106e4ad51afe043c0176a595f6.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- knot sliders go here -->
@@ -2916,11 +2520,7 @@ for(let L = 1; L &lt;= order; L++) {
 <graphics-element title="A (closed) rational, uniform B-Spline" width="400" height="400" src="./chapters/bsplines/rational-uniform.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\bsplines\0d9c2186423466a32bb8fbd187409f82.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/bsplines/0d9c2186423466a32bb8fbd187409f82.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- knot sliders go here -->
@@ -2965,10 +2565,7 @@ for(let L = 1; L &lt;= order; L++) {
       Go do something cool with it!
     </footer>
 
-<<<<<<< HEAD
     <!-- fix firefox's scroll position algorithm. Due to how it works, it cannot be async/defer -->
-=======
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
     <script src="./js/site/fix-scroll.js"></script>
   </body>
 </html>
diff --git a/docs/zh-CN/index.html b/docs/zh-CN/index.html
index bce47532..4d56d012 100644
--- a/docs/zh-CN/index.html
+++ b/docs/zh-CN/index.html
@@ -14,7 +14,6 @@
     <link rel="stylesheet" href="placeholder-style.css" />
 
     <!-- And a slew of SEO related meta elements, because being discoverable is important -->
-<<<<<<< HEAD
 <meta name="description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
 
 <!-- opengraph information -->
@@ -37,30 +36,6 @@
 <meta name="twitter:image" content="https://pomax.github.io/bezierinfo/images/og-image.png" />
 <meta name="twitter:url" content="https://pomax.github.io/bezierinfo" />
 <meta name="twitter:description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
-=======
-    <meta name="description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
-
-    <!-- opengraph information -->
-    <meta property="og:title" content="贝塞尔曲线底漆" />
-    <meta property="og:image" content="https://pomax.github.io/bezierinfo/images/og-image.png" />
-    <meta property="og:type" content="text" />
-    <meta property="og:url" content="https://pomax.github.io/bezierinfo" />
-    <meta property="og:description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
-    <meta property="og:locale" content="zh-CN}}" />
-    <meta property="og:type" content="article" />
-    <meta property="og:published_time" content="2013-06-13 12:00:00" />
-    <meta property="og:author" content="Mike 'Pomax' Kamermans" />
-    <meta property="og:section" content="Bézier Curves" />
-    <meta property="og:tag" content="Bézier Curves" />
-
-    <!-- twitter card information -->
-    <meta name="twitter:card" content="summary" />
-    <meta name="twitter:site" content="@TheRealPomax" />
-    <meta name="twitter:creator" content="@TheRealPomax" />
-    <meta name="twitter:image" content="https://pomax.github.io/bezierinfo/images/og-image.png" />
-    <meta name="twitter:url" content="https://pomax.github.io/bezierinfo" />
-    <meta name="twitter:description" content="A detailed explanation of Bézier curves, and how to do the many things that we commonly want to do with them." />
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
 
     <!-- my own referral/page hit tracker, because Google knows enough -->
     <script src="./js/site/referrer.js" type="module" async></script>
@@ -79,7 +54,6 @@
   </head>
 
   <body>
-<<<<<<< HEAD
     <div class="dev" style="display:none;">
     DEV PREVIEW ONLY
     <script>
@@ -122,20 +96,11 @@
       <h1>贝塞尔曲线底漆</h1>
       <h2>A free, online book for when you really need to know how to do Bézier things.</h2>
       <span>Read this in your own language:</span>
-=======
-    <header>
-      <h1>贝塞尔曲线底漆</h1>
-      <h2>A free, online book for when you really need to know how to do Bézier things.</h2>
-
-      <span>Read this in your own language:</span>
-
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
       <ul class="lang-switcher">
         <li><a href="./index.html">English</a></li>
 <li><a href="./ja-JP/index.html">日本語</a></li>
 <li><a href="./zh-CN/index.html">中文</a></li>
       </ul>
-<<<<<<< HEAD
       <p>Don't see your language listed? <a href="https://github.com/Pomax/BezierInfo-2/wiki/localize">Help translate this content!</a></p>
 
       <noscript>
@@ -146,32 +111,13 @@
         </header>
 
         <p>
-=======
-
-      <p>Don't see your language listed? <a href="https://github.com/Pomax/BezierInfo-2/wiki/localize">Help translate this content!</a></p>
-
-      <noscript>
-        <div class="note">
-          <header>
-            <h2>This site (obviously) works best with JS enabled</h2>
-            <h3>But it's not required.</h3>
-          </header>
-
-          <p>
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
             If you can read this &lt;noscript&gt; content, you have scripts disabled: thankfully,
             this site is not going to force you to turn it on just to see any content. Everything
             will work just fine, you can still read the text, navigate to sections, and see the
             graphics that are used to illustrate the concepts that individual sections talk about.
-<<<<<<< HEAD
         </p>
 
         <p>
-=======
-          </p>
-
-          <p>
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
             <strong>However</strong>, a big part of this primer's experience is the fact that all
             graphics are interactive, and for that to work, HTML Custom Elements need to work,
             which requires Javascript to be enabled. If anything, you'll probably want to allow
@@ -182,15 +128,9 @@
             lets me see who's linking to the primer, which you probably don't care about, but lets
             me strike up conversations with folks who I would otherwise never know thought the
             primer was worth linking to, and I like talking to people who care enough to link)
-<<<<<<< HEAD
         </p>
     </div>
 </noscript>
-=======
-          </p>
-        </div>
-      </noscript>
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
 
       <nav aria-labelledby="toc">
         <h1 id="toc">目录</h1>
@@ -271,17 +211,9 @@
       <section id="changelog">
         <h1>What's new?</h1>
         <p>This primer is a living document, and so depending on when you last look at it, there may be new content. Click the following link to expand this section to have a look at what got added, when.</p>
-<<<<<<< HEAD
         <!-- non-JS content reveals are nice -->
         <label for="changelogtoggle">Toggle changes</label>
         <input type="checkbox" id="changelogtoggle">
-=======
-
-        <!-- non-JS content reveals are nice -->
-        <label for="changelogtoggle">Toggle changes</label>
-        <input type="checkbox" id="changelogtoggle">
-
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
         <section><h2>August-September 2020</h2><ul><li>Completely overhauled the site: the Primer is now a normal web page that works fine with JS disabled, but obviously better with JS turned on.</li></ul>
 <h2>June 2020</h2><ul><li>Added automatic CI/CD using Github Actions</li></ul>
 <h2>January 2020</h2><ul><li>Added reset buttons to all graphics</li>
@@ -331,21 +263,13 @@
   <graphics-element title="二次贝塞尔曲线" width="275" height="275" src="./chapters/introduction/quadratic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\introduction\54e9ec0600ac436b0e6f0c6b5005cf03.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/introduction/54e9ec0600ac436b0e6f0c6b5005cf03.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>二次贝塞尔曲线</label>
         </fallback-image></graphics-element>
   <graphics-element title="三次贝塞尔曲线" width="275" height="275" src="./chapters/introduction/cubic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\introduction\8d158a13e9a86969b99c64057644cbc6.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/introduction/8d158a13e9a86969b99c64057644cbc6.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>三次贝塞尔曲线</label>
         </fallback-image></graphics-element>
 </div>
@@ -364,11 +288,7 @@
 <graphics-element title="Linear Interpolation leading to Bézier curves" width="825" height="275" src="./chapters/whatis/interpolation.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
-          <img width="825px" height="275px" src="images\chapters\whatis\9b3633889c38325c24c19ce18ab94ad6.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/whatis/524dd296e96c0fe2281fb95146f8ea65.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
+          <img width="825px" height="275px" src="images\chapters\whatis\524dd296e96c0fe2281fb95146f8ea65.png">
           <label></label>
         </fallback-image>
   <input type="range" min="10" max="90" step="1" value="25" class="slide-control">
@@ -394,11 +314,7 @@
 <graphics-element title="(一部分的)圆: x=sin(t), y=cos(t)" width="275" height="275" src="./chapters/explanation/circle.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\explanation\6d2f915735ebdc05e42c0ea7adc85343.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/explanation/6d2f915735ebdc05e42c0ea7adc85343.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>(一部分的)圆: x=sin(t), y=cos(t)</label>
         </fallback-image>
   <input type="range" min="0" max="10" step="0.1" value="5" class="slide-control">
@@ -481,11 +397,7 @@ function Bezier(3,t):
   <graphics-element title="二次插值" width="275" height="275" src="./chapters/control/lerp.js" data-degree="3">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\control\2a0635829051977b265b64ef204f718e.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/control/2a0635829051977b265b64ef204f718e.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>二次插值</label>
         </fallback-image>
     <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -494,11 +406,7 @@ function Bezier(3,t):
   <graphics-element title="三次插值" width="275" height="275" src="./chapters/control/lerp.js" data-degree="4">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\control\fca18b2602929f80e68d8964832f0f44.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/control/fca18b2602929f80e68d8964832f0f44.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>三次插值</label>
         </fallback-image>
     <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -507,11 +415,7 @@ function Bezier(3,t):
   <graphics-element title="15次插值" width="275" height="275" src="./chapters/control/lerp.js" data-degree="15">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\control\989f4ca49d7099802cc0345dbeddca8c.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/control/989f4ca49d7099802cc0345dbeddca8c.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>15次插值</label>
         </fallback-image>
     <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -568,11 +472,7 @@ function Bezier(3,t,w[]):
 <graphics-element title="Our rational cubic Bézier curve" width="275" height="275" src="./chapters/weightcontrol/rational.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\weightcontrol\be18e8119472af796329f3e2159bdf94.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/weightcontrol/be18e8119472af796329f3e2159bdf94.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Our rational cubic Bézier curve</label>
         </fallback-image>
   <input type="range" min="0.01" max="2" value="1" step="0.01" class="ratio-1">
@@ -631,21 +531,13 @@ function RationalBezier(3,t,w[],r[]):
 <graphics-element title="二次无限区间贝塞尔曲线" width="275" height="275" src="./chapters/extended/extended.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\extended\391a61142c56b79260680aefb08cd9c4.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/extended/391a61142c56b79260680aefb08cd9c4.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>二次无限区间贝塞尔曲线</label>
         </fallback-image></graphics-element>
 <graphics-element title="三次无限区间贝塞尔曲线" width="275" height="275" src="./chapters/extended/extended.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\extended\baeceec6e1587794b8b275a90d5d85e9.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/extended/baeceec6e1587794b8b275a90d5d85e9.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>三次无限区间贝塞尔曲线</label>
         </fallback-image></graphics-element>
 </div>
@@ -698,11 +590,7 @@ function RationalBezier(3,t,w[],r[]):
 <graphics-element title="用de Casteljau算法来遍历曲线" width="275" height="275" src="./chapters/decasteljau/decasteljau.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\decasteljau\715d1d2eecc762d6bc1470954b145018.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/decasteljau/715d1d2eecc762d6bc1470954b145018.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>用de Casteljau算法来遍历曲线</label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -743,11 +631,7 @@ function RationalBezier(3,t,w[],r[]):
   <graphics-element title="拉平一条二次曲线" width="275" height="275" src="./chapters/flattening/flatten.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\flattening\3deec756c96e53127cd1d615c61043ae.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/flattening/3deec756c96e53127cd1d615c61043ae.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>拉平一条二次曲线</label>
         </fallback-image>
     <input type="range" min="1" max="16" step="1" value="4" class="slide-control">
@@ -756,11 +640,7 @@ function RationalBezier(3,t,w[],r[]):
   <graphics-element title="拉平一条三次曲线" width="275" height="275" src="./chapters/flattening/flatten.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\flattening\e2bb7113d5cda2e3fd29bbc54fbe8841.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/flattening/e2bb7113d5cda2e3fd29bbc54fbe8841.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>拉平一条三次曲线</label>
         </fallback-image>
     <input type="range" min="1" max="24" step="1" value="8" class="slide-control">
@@ -797,11 +677,7 @@ function RationalBezier(3,t,w[],r[]):
 <graphics-element title="分割一条曲线" width="825" height="275" src="./chapters/splitting/splitting.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\splitting\891133c5f0e140b8c7e179af04e497e0.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/splitting/891133c5f0e140b8c7e179af04e497e0.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0.5" class="slide-control">
@@ -925,11 +801,7 @@ function drawCurve(points[], t):
 <graphics-element title="A variable-order Bézier curve" width="275" height="275" src="./chapters/reordering/reorder.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\reordering\71f47629388901b821976e034be159e4.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/reordering/71f47629388901b821976e034be159e4.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A variable-order Bézier curve</label>
         </fallback-image>
   <button class="raise">raise</button>
@@ -1005,21 +877,13 @@ treated as a sequence of three (elementary) shear operations. When we combine th
   <graphics-element title="Quadratic Bézier tangents and normals" width="275" height="275" src="./chapters/pointvectors/pointvectors.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointvectors\f4d72cc162d4cbcc6d6a459fced01cfb.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointvectors/f4d72cc162d4cbcc6d6a459fced01cfb.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Quadratic Bézier tangents and normals</label>
         </fallback-image></graphics-element>
   <graphics-element title="Cubic Bézier tangents and normals" width="275" height="275" src="./chapters/pointvectors/pointvectors.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointvectors\2724b6c42f36b4dbea6962cac844d2c3.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointvectors/2724b6c42f36b4dbea6962cac844d2c3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Cubic Bézier tangents and normals</label>
         </fallback-image></graphics-element>
 </div>
@@ -1049,11 +913,7 @@ treated as a sequence of three (elementary) shear operations. When we combine th
 <graphics-element title="Some known and unknown vectors" width="350" height="300" src="./chapters/pointvectors3d/frenet.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="350px" height="300px" src="images\chapters\pointvectors3d\59b6ce3fcbf79da171d86e962597097e.png">
-=======
-          <img width="350px" height="300px" src="images/chapters/pointvectors3d/59b6ce3fcbf79da171d86e962597097e.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -1128,11 +988,7 @@ treated as a sequence of three (elementary) shear operations. When we combine th
 <graphics-element title="Some known and unknown vectors" width="350" height="300" src="./chapters/pointvectors3d/rotation-minimizing.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="350px" height="300px" src="images\chapters\pointvectors3d\9983328e50c2156c124bb1ea4ad5c05b.png">
-=======
-          <img width="350px" height="300px" src="images/chapters/pointvectors3d/9983328e50c2156c124bb1ea4ad5c05b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0" class="slide-control">
@@ -1151,22 +1007,14 @@ treated as a sequence of three (elementary) shear operations. When we combine th
 <graphics-element title="Quadratic Bézier curve components" width="825" height="275" src="./chapters/components/components.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\components\008604bc4c53bd7e0d97c99a67812ad1.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/components/008604bc4c53bd7e0d97c99a67812ad1.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
 <graphics-element title="Cubic Bézier curve components" width="825" height="275" src="./chapters/components/components.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\components\5214256129e6396e7ac1f1713fa9c88d.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/components/5214256129e6396e7ac1f1713fa9c88d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1303,11 +1151,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Quadratic Bézier curve extremities" width="825" height="275" src="./chapters/extremities/extremities.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\extremities\9850eec01924deae7fda4400ce44270d.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/extremities/9850eec01924deae7fda4400ce44270d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1315,11 +1159,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Cubic Bézier curve extremities" width="825" height="275" src="./chapters/extremities/extremities.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\extremities\890406c7bc96904224f8f14940bf3e56.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/extremities/890406c7bc96904224f8f14940bf3e56.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1338,21 +1178,13 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Quadratic Bézier bounding box" width="275" height="275" src="./chapters/boundingbox/bbox.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\boundingbox\e2c621442e98e2cd20af7efe1cfb041f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/boundingbox/e2c621442e98e2cd20af7efe1cfb041f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Quadratic Bézier bounding box</label>
         </fallback-image></graphics-element>
 <graphics-element title="Cubic Bézier bounding box" width="275" height="275" src="./chapters/boundingbox/bbox.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\boundingbox\f8989a62ebec9d6f123291c146caab5b.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/boundingbox/f8989a62ebec9d6f123291c146caab5b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Cubic Bézier bounding box</label>
         </fallback-image></graphics-element>
 </div>
@@ -1376,21 +1208,13 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Aligning a quadratic curve" width="550" height="275" src="./chapters/aligning/aligning.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\aligning\b3ccd45a72c815388aee6515fe37a486.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/aligning/b3ccd45a72c815388aee6515fe37a486.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 <graphics-element title="Aligning a cubic curve" width="550" height="275" src="./chapters/aligning/aligning.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\aligning\31655f24b7dd8b8871687b6610d9ac0e.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/aligning/31655f24b7dd8b8871687b6610d9ac0e.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 </div>
@@ -1404,21 +1228,13 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Aligning a quadratic curve" width="275" height="275" src="./chapters/tightbounds/tightbounds.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\tightbounds\ccc77ae1f57d7dd7ce4d5397fe1b140b.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/tightbounds/ccc77ae1f57d7dd7ce4d5397fe1b140b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Aligning a quadratic curve</label>
         </fallback-image></graphics-element>
 <graphics-element title="Aligning a cubic curve" width="275" height="275" src="./chapters/tightbounds/tightbounds.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\tightbounds\419415bee6ffd7598c035c42de09a94f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/tightbounds/419415bee6ffd7598c035c42de09a94f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Aligning a cubic curve</label>
         </fallback-image></graphics-element>
 </div>
@@ -1459,11 +1275,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Finding cubic Bézier curve inflections" width="275" height="275" src="./chapters/inflections/inflection.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\inflections\9e1ce3975100600d4979370851929b73.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/inflections/9e1ce3975100600d4979370851929b73.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Finding cubic Bézier curve inflections</label>
         </fallback-image></graphics-element>
 
@@ -1476,11 +1288,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="The canonical curve map" width="400" height="400" src="./chapters/canonical/canonical.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\canonical\c086e72bd8aaeab37436515ab251b2df.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/canonical/c086e72bd8aaeab37436515ab251b2df.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1547,11 +1355,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="A cubic curve mapped to canonical form" width="800" height="400" src="./chapters/canonical/interactive.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="800px" height="400px" src="images\chapters\canonical\83fe2473e20ea68b768765129ee44ae4.png">
-=======
-          <img width="800px" height="400px" src="images/chapters/canonical/83fe2473e20ea68b768765129ee44ae4.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1563,11 +1367,7 @@ function getCubicRoots(pa, pb, pc, pd) {
 <graphics-element title="Finding t, given x=x(t). Left: our curve, right: the function x=f(t)" width="550" height="275" src="./chapters/yforx/basics.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\yforx\dd28d64458d22f4fe89c98568258efcb.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/yforx/dd28d64458d22f4fe89c98568258efcb.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" class="slide-control">
@@ -1595,11 +1395,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Finding By(t), by finding t for a given x" width="275" height="275" src="./chapters/yforx/yforx.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\yforx\efcfe9b48ca4e65eef3d4bf3e4c97bc3.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/yforx/efcfe9b48ca4e65eef3d4bf3e4c97bc3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Finding By(t), by finding t for a given x</label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" class="slide-control">
@@ -1622,31 +1418,19 @@ y = curve.get(t).y</code></pre>
   <graphics-element title="A function's approximated integral" width="275" height="275" src="./chapters/arclength/draw-slices.js" data-steps="10">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclength\dc74a2f2da19470b8d721ece5f3ce268.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclength/dc74a2f2da19470b8d721ece5f3ce268.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A function's approximated integral</label>
         </fallback-image></graphics-element>
   <graphics-element title="A better approximation" width="275" height="275" src="./chapters/arclength/draw-slices.js" data-steps="24">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclength\4bffba7dda2a3556cf5b2ae7392083c6.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclength/4bffba7dda2a3556cf5b2ae7392083c6.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A better approximation</label>
         </fallback-image></graphics-element>
   <graphics-element title="An even better approximation" width="275" height="275" src="./chapters/arclength/draw-slices.js" data-steps="99">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclength\4b5d220d02b08f6c9aa19389255ef8bb.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclength/4b5d220d02b08f6c9aa19389255ef8bb.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>An even better approximation</label>
         </fallback-image></graphics-element>
 </div>
@@ -1670,11 +1454,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Arc length for a Bézier curve" width="275" height="275" src="./chapters/arclength/arclength.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclength\195f9a3c60f8dfe977c6450d21968f69.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclength/195f9a3c60f8dfe977c6450d21968f69.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Arc length for a Bézier curve</label>
         </fallback-image></graphics-element>
 
@@ -1688,11 +1468,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Approximate quadratic curve arc length" width="275" height="275" src="./chapters/arclengthapprox/approximate.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclengthapprox\a040f6b7c7c33ada25ecfd1060726545.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclengthapprox/a040f6b7c7c33ada25ecfd1060726545.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Approximate quadratic curve arc length</label>
         </fallback-image>
     <input type="range" min="2" max="24" step="1" value="4" class="slide-control">
@@ -1701,11 +1477,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Approximate cubic curve arc length" width="275" height="275" src="./chapters/arclengthapprox/approximate.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arclengthapprox\c270144cc41e4ebc4b0b2331473530fa.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arclengthapprox/c270144cc41e4ebc4b0b2331473530fa.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Approximate cubic curve arc length</label>
         </fallback-image>
     <input type="range" min="2" max="32" step="1" value="8" class="slide-control">
@@ -1753,11 +1525,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Matching curvatures for a quadratic and cubic Bézier curve" width="825" height="275" src="./chapters/curvature/curvature.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\curvature\5fcfb0572cae06717506c84768aa568c.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/curvature/5fcfb0572cae06717506c84768aa568c.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1767,11 +1535,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="(Easier) curvature matching for a quadratic and cubic Bézier curve" width="825" height="275" src="./chapters/curvature/curvature.js" data-omni="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\curvature\876d7b2750d7c29068ac6181c3634d25.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/curvature/876d7b2750d7c29068ac6181c3634d25.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="0" max="2" step="0.0005" value="0" class="slide-control">
@@ -1787,11 +1551,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="The t-for-distance function" width="550" height="275" src="./chapters/tracing/distance-function.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\tracing\52f815cefe99dabc47ca83d0b97b61fc.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/tracing/52f815cefe99dabc47ca83d0b97b61fc.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -1800,11 +1560,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Fixed-interval coloring a curve" width="825" height="275" src="./chapters/tracing/tracing.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\tracing\09cfa54ec3709d54efdce78832e42367.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/tracing/09cfa54ec3709d54efdce78832e42367.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="2" max="24" step="1" value="8" class="slide-control">
@@ -1824,11 +1580,7 @@ y = curve.get(t).y</code></pre>
 <graphics-element title="Line/line intersections" width="275" height="275" src="./chapters/intersections/line-line.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\intersections\cab1799841eedd1dcd1cd81b6045f40f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/intersections/cab1799841eedd1dcd1cd81b6045f40f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Line/line intersections</label>
         </fallback-image></graphics-element>
 
@@ -1861,21 +1613,13 @@ lli = function(line1, line2):
 <graphics-element title="Quadratic curve/line intersections" width="275" height="275" src="./chapters/intersections/curve-line.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\intersections\7003a384ec371217af2b225ae65872e7.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/intersections/7003a384ec371217af2b225ae65872e7.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Quadratic curve/line intersections</label>
         </fallback-image></graphics-element>
 <graphics-element title="Cubic curve/line intersections" width="275" height="275" src="./chapters/intersections/curve-line.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\intersections\4a762fb56468c342c72756a76d134f05.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/intersections/4a762fb56468c342c72756a76d134f05.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Cubic curve/line intersections</label>
         </fallback-image></graphics-element>
 </div>
@@ -1903,11 +1647,7 @@ lli = function(line1, line2):
 <graphics-element title="Curve/curve intersections" width="825" height="275" src="./chapters/curveintersection/curve-curve.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\curveintersection\e1f4f4dba7a338d342559bcfb0ea8e02.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/curveintersection/e1f4f4dba7a338d342559bcfb0ea8e02.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <button class="next">Advance one step</button>
@@ -1928,11 +1668,7 @@ lli = function(line1, line2):
 <graphics-element inline={true} title="Projections in a quadratic Bézier curve" width="275" height="275" src="./chapters/abc/abc.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\abc\7a69dd4350ddda5701712e1d3b46b863.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/abc/7a69dd4350ddda5701712e1d3b46b863.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Projections in a quadratic Bézier curve</label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0.5" class="slide-control">
@@ -1940,11 +1676,7 @@ lli = function(line1, line2):
 <graphics-element inline={true} title="Projections in a cubic Bézier curve" width="275" height="275" src="./chapters/abc/abc.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\abc\eeec7cf16fb22c666e0143a3a030731f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/abc/eeec7cf16fb22c666e0143a3a030731f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Projections in a cubic Bézier curve</label>
         </fallback-image>
   <input type="range" min="0" max="1" step="0.01" value="0.5" class="slide-control">
@@ -1992,11 +1724,7 @@ lli = function(line1, line2):
 <graphics-element title="Fitting a quadratic Bézier curve" width="275" height="275" src="./chapters/pointcurves/quadratic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointcurves\067a3df30e32708fc0d13f8eb78c0b05.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointcurves/067a3df30e32708fc0d13f8eb78c0b05.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Fitting a quadratic Bézier curve</label>
         </fallback-image></graphics-element>
 
@@ -2005,11 +1733,7 @@ lli = function(line1, line2):
 <graphics-element title="Finding a circle through three points" width="275" height="275" src="./chapters/pointcurves/circle.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointcurves\43875f6ad588bfd04cdb65b591a62052.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointcurves/43875f6ad588bfd04cdb65b591a62052.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Finding a circle through three points</label>
         </fallback-image></graphics-element>
 
@@ -2023,11 +1747,7 @@ lli = function(line1, line2):
 <graphics-element title="Finding the cubic e₁ and e₂ given three points " width="275" height="275" src="./chapters/pointcurves/circle.js" data-show-curve="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointcurves\75f7b5b31e98444e13f17e5c3e5b7322.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointcurves/75f7b5b31e98444e13f17e5c3e5b7322.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Finding the cubic e₁ and e₂ given three points </label>
         </fallback-image></graphics-element>
 
@@ -2035,11 +1755,7 @@ lli = function(line1, line2):
 <graphics-element title="Fitting a quadratic Bézier curve" width="275" height="275" src="./chapters/pointcurves/cubic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\pointcurves\eab6ea46fa93030e03ec0ef7deb571dc.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/pointcurves/eab6ea46fa93030e03ec0ef7deb571dc.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Fitting a quadratic Bézier curve</label>
         </fallback-image></graphics-element>
 
@@ -2069,11 +1785,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Projecting a point onto a Bézier curve" width="400" height="400" src="./chapters/projections/project.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\projections\3cc334d0ebc01cc5352e23ed47bc5414.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/projections/3cc334d0ebc01cc5352e23ed47bc5414.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2089,11 +1801,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Molding a quadratic Bézier curve" width="825" height="275" src="./chapters/molding/molding.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\molding\aefb177e5532a9f995b9d88e85582c68.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/molding/aefb177e5532a9f995b9d88e85582c68.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2102,11 +1810,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Molding a cubic Bézier curve" width="825" height="275" src="./chapters/molding/molding.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\molding\834af194de17a5eb2c1920773ab904e3.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/molding/834af194de17a5eb2c1920773ab904e3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2115,11 +1819,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Molding a cubic Bézier curve" width="825" height="275" src="./chapters/molding/molding.js" data-type="cubic" data-interpolated="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="825px" height="275px" src="images\chapters\molding\cdf7515d133cbf41ffbaea8c488e0924.png">
-=======
-          <img width="825px" height="275px" src="images/chapters/molding/cdf7515d133cbf41ffbaea8c488e0924.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="10" max="200" step="1" value="100" class="slide-control">
@@ -2205,11 +1905,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="Fitting a Bézier curve" width="550" height="275" src="./chapters/curvefitting/curve-fitting.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="550px" height="275px" src="images\chapters\curvefitting\798f3d7151dfb2887c7881a08e65cdd3.png">
-=======
-          <img width="550px" height="275px" src="images/chapters/curvefitting/798f3d7151dfb2887c7881a08e65cdd3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <button class="toggle">toggle</button>
@@ -2226,11 +1922,7 @@ for (coordinate, index) in LUT:
 <graphics-element title="A Catmull-Rom curve" width="275" height="275" src="./chapters/catmullconv/catmull-rom.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\catmullconv\aa46749b9469341d9249ca452390d875.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/catmullconv/aa46749b9469341d9249ca452390d875.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>A Catmull-Rom curve</label>
         </fallback-image>
   <input type="range" min="0.1" max="1" step="0.01" value="0.5" class="slide-control tension">
@@ -2358,21 +2050,13 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Unlinked quadratic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="quadratic" data-link="coordinate">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\044f65dd588b0210499add16ea50a23d.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/044f65dd588b0210499add16ea50a23d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Unlinked quadratic poly-Bézier</label>
         </fallback-image></graphics-element>
 <graphics-element title="Unlinked cubic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="cubic" data-link="coordinate">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\babb27083b805c7c77bb93cfecbefb2b.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/babb27083b805c7c77bb93cfecbefb2b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Unlinked cubic poly-Bézier</label>
         </fallback-image></graphics-element>
 
@@ -2384,21 +2068,13 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Connected quadratic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="quadratic" data-link="derivative">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\b492c486c25f17a95c690e235b8ad483.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/b492c486c25f17a95c690e235b8ad483.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Connected quadratic poly-Bézier</label>
         </fallback-image></graphics-element>
 <graphics-element title="Connected cubic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="cubic" data-link="derivative">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\adc3b55c9956849ec86ecffcd8864d8a.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/adc3b55c9956849ec86ecffcd8864d8a.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Connected cubic poly-Bézier</label>
         </fallback-image></graphics-element>
 
@@ -2408,21 +2084,13 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Angularly connected quadratic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="quadratic" data-link="direction">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\17a6ffbfffaa9046ad165ca880d9030d.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/17a6ffbfffaa9046ad165ca880d9030d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Angularly connected quadratic poly-Bézier</label>
         </fallback-image></graphics-element>
 <graphics-element title="Angularly connected cubic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="cubic" data-link="direction">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\b7dfe772ac90d762f48772b691a9070f.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/b7dfe772ac90d762f48772b691a9070f.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Angularly connected cubic poly-Bézier</label>
         </fallback-image></graphics-element>
 
@@ -2431,21 +2099,13 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Standard connected quadratic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="quadratic" data-link="conventional">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\a1a3aabd22c0221beb38403a4532ea86.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/a1a3aabd22c0221beb38403a4532ea86.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Standard connected quadratic poly-Bézier</label>
         </fallback-image></graphics-element>
 <graphics-element title="Standard connected cubic poly-Bézier" width="275" height="275" src="./chapters/polybezier/poly.js" data-type="cubic"  data-link="conventional">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\polybezier\b810f02639a79cf7f8ae416d7185614d.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/polybezier/b810f02639a79cf7f8ae416d7185614d.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Standard connected cubic poly-Bézier</label>
         </fallback-image></graphics-element>
 
@@ -2485,11 +2145,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Offsetting a quadratic Bézier curve" width="275" height="275" src="./chapters/offsetting/offsetting.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\offsetting\768094c3c47d3888cf81e7a1d20d2eab.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/offsetting/768094c3c47d3888cf81e7a1d20d2eab.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Offsetting a quadratic Bézier curve</label>
         </fallback-image>
   <input type="range" min="5" max="50" step="1" value="20" class="slide-control">
@@ -2498,11 +2154,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Offsetting a cubic Bézier curve" width="275" height="275" src="./chapters/offsetting/offsetting.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\offsetting\1ad78f9f9d001278c491b0f2be5cc8ea.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/offsetting/1ad78f9f9d001278c491b0f2be5cc8ea.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Offsetting a cubic Bézier curve</label>
         </fallback-image>
   <input type="range" min="5" max="50" step="1" value="20" class="slide-control">
@@ -2526,11 +2178,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Offsetting a quadratic Bézier curve" width="275" height="275" src="./chapters/graduatedoffset/offsetting.js" data-type="quadratic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\graduatedoffset\8cc724d5343c65685d88c92b2d069a2a.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/graduatedoffset/8cc724d5343c65685d88c92b2d069a2a.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Offsetting a quadratic Bézier curve</label>
         </fallback-image>
   <input type="range" min="5" max="50" step="1" value="20" class="slide-control">
@@ -2539,11 +2187,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Offsetting a cubic Bézier curve" width="275" height="275" src="./chapters/graduatedoffset/offsetting.js" data-type="cubic">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\graduatedoffset\17bf62e05a1fc3387b0c210f2decff45.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/graduatedoffset/17bf62e05a1fc3387b0c210f2decff45.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Offsetting a cubic Bézier curve</label>
         </fallback-image>
   <input type="range" min="5" max="50" step="1" value="20" class="slide-control">
@@ -2560,11 +2204,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Quadratic Bézier arc approximation" width="400" height="400" src="./chapters/circles/arc-approximation.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\circles\5801de8227960faa9bcbae578f78c2a3.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/circles/5801de8227960faa9bcbae578f78c2a3.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="-3.1415" max="3.1415" step="0.01" value="-0.7854" class="slide-control">
@@ -2621,11 +2261,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Cubic Bézier arc approximation" width="400" height="400" src="./chapters/circles_cubic/arc-approximation.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\circles_cubic\da768b84c91262bab8ab36f895e8569b.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/circles_cubic/da768b84c91262bab8ab36f895e8569b.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <input type="range" min="-3.1415" max="3.1415" step="0.01" value="-0.7854" class="slide-control">
@@ -2690,11 +2326,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Cubic Bézier circle approximation" width="340" height="300" src="./chapters/circles_cubic/circle.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="340px" height="300px" src="images\chapters\circles_cubic\63f35fb58d3571200ac6ccea0384b9d7.png">
-=======
-          <img width="340px" height="300px" src="images/chapters/circles_cubic/63f35fb58d3571200ac6ccea0384b9d7.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2735,11 +2367,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="First arc approximation of a Bézier curve" width="275" height="275" src="./chapters/arcapproximation/arc.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arcapproximation\7c9cce8142fa3e85bb124520f40645ff.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arcapproximation/7c9cce8142fa3e85bb124520f40645ff.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>First arc approximation of a Bézier curve</label>
         </fallback-image>
   <input type="range" min="0.1" max="5" step="0.1" value="0.5" class="slide-control">
@@ -2749,11 +2377,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="Arc approximation of a Bézier curve" width="275" height="275" src="./chapters/arcapproximation/arcs.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="275px" height="275px" src="images\chapters\arcapproximation\da76341b841df1af8a39f797e85dfe3c.png">
-=======
-          <img width="275px" height="275px" src="images/chapters/arcapproximation/da76341b841df1af8a39f797e85dfe3c.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label>Arc approximation of a Bézier curve</label>
         </fallback-image>
   <input type="range" min="0.1" max="5" step="0.1" value="0.5" class="slide-control">
@@ -2770,11 +2394,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="A B-Spline example" width="600" height="300" src="./chapters/bsplines/basic.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="600px" height="300px" src="images\chapters\bsplines\fe3a8ca5706f286d916e36699e237e51.png">
-=======
-          <img width="600px" height="300px" src="images/chapters/bsplines/fe3a8ca5706f286d916e36699e237e51.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image></graphics-element>
 
@@ -2788,11 +2408,7 @@ for p = 1 to points.length-3 (inclusive):
 <graphics-element title="The components of a B-Spline " width="600" height="300" src="./chapters/bsplines/basic.js" data-show-curves="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="600px" height="300px" src="images\chapters\bsplines\41167c64c51386414c6e62f0b45e6295.png">
-=======
-          <img width="600px" height="300px" src="images/chapters/bsplines/41167c64c51386414c6e62f0b45e6295.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- basis curve highlighter goes here -->
@@ -2858,11 +2474,7 @@ for(let L = 1; L &lt;= order; L++) {
 <graphics-element title="A uniform B-Spline" width="400" height="400" src="./chapters/bsplines/uniform.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\bsplines\48a30189e74658737b3a8b28bb816f8a.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/bsplines/48a30189e74658737b3a8b28bb816f8a.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- knot sliders go here -->
@@ -2875,11 +2487,7 @@ for(let L = 1; L &lt;= order; L++) {
 <graphics-element title="A reduced uniform B-Spline" width="400" height="400" src="./chapters/bsplines/reduced.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\bsplines\ceaef2fbee05a58aa11835925403b4cd.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/bsplines/ceaef2fbee05a58aa11835925403b4cd.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- knot sliders go here -->
@@ -2892,11 +2500,7 @@ for(let L = 1; L &lt;= order; L++) {
 <graphics-element title="An open, uniform B-Spline" width="400" height="400" src="./chapters/bsplines/uniform.js" data-open="true">
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\bsplines\0215dc106e4ad51afe043c0176a595f6.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/bsplines/0215dc106e4ad51afe043c0176a595f6.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- knot sliders go here -->
@@ -2910,11 +2514,7 @@ for(let L = 1; L &lt;= order; L++) {
 <graphics-element title="A (closed) rational, uniform B-Spline" width="400" height="400" src="./chapters/bsplines/rational-uniform.js" >
         <fallback-image>
           <span class="view-source">Scripts are disabled. Showing fallback image.</span>
-<<<<<<< HEAD
           <img width="400px" height="400px" src="images\chapters\bsplines\0d9c2186423466a32bb8fbd187409f82.png">
-=======
-          <img width="400px" height="400px" src="images/chapters/bsplines/0d9c2186423466a32bb8fbd187409f82.png">
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
           <label></label>
         </fallback-image>
   <!-- knot sliders go here -->
@@ -2959,10 +2559,7 @@ for(let L = 1; L &lt;= order; L++) {
       Go do something cool with it!
     </footer>
 
-<<<<<<< HEAD
     <!-- fix firefox's scroll position algorithm. Due to how it works, it cannot be async/defer -->
-=======
->>>>>>> 87e04adbf7994baeb068384f6760469ed5a5c22b
     <script src="./js/site/fix-scroll.js"></script>
   </body>
 </html>
