resolving local merge conflict

cms/static/sass/_index.scss

@@ -218,7 +218,7 @@
           }
 
           strong {
-            color: $pink-l1;
+            color: $gray-d2;
             font-weight: 500;
           }
 

cms/templates/howitworks.html

@@ -40,7 +40,7 @@
           <ul class="list-proofpoints">
             <li class="proofpoint">
               <h4 class="title">Simple Organization For Content</h4>
-              <p>Studio uses <strong>Sections</strong> and <strong>Learning Sequences</strong> to organize your content into a simple hierarchy.</p>
+              <p>Studio uses a simple hierarchy of <strong>sections</strong> and <strong>subsections</strong> to organize your content.</p>
             </li>
 
             <li class="proofpoint">
@@ -50,7 +50,7 @@
 
             <li class="proofpoint">
               <h4 class="title">Go A Week Or A Semester At A Time</h4>
-              <p>Build and release <strong>Sections</strong> to your students incrementally. You don't have to have it all done at once.</p>
+              <p>Build and release <strong>sections</strong> to your students incrementally. You don't have to have it all done at once.</p>
             </li>
           </ul>
         </div>
@@ -68,18 +68,18 @@
         </figure>
 
         <div class="copy">
-          <h3>Learning Sequences: Lectures and Exercises, Together </h3>
-          <p>The heart of the student experience is being immersed in <strong>Learning Sequences</strong> &mdash; short video lectures interleaved with exercises. Studio allows you to insert videos and author a wide variety of exercise types with just a few clicks. </p>
+          <h3>Learning is More than Just Lectures</h3>
+          <p>Studio lets you weave your content together in a way that reinforces learning &mdash; short video lectures interleaved with exercises and more. Insert videos and author a wide variety of exercise types with just a few clicks. </p>
 
           <ul class="list-proofpoints">
             <li class="proofpoint">
               <h4 class="title">Create Learning Pathways</h4>
-              <p>Help your students understand a small interactive piece at a time. <strong>Learning Sequences</strong> are built from <strong>Learning Units</strong>.</p>
+              <p>Help your students understand a small interactive piece at a time with multimedia, HTML, and exercises.</p>
             </li>
 
             <li class="proofpoint">
               <h4 class="title">Work Visually, Organize Quickly</h4>
-              <p>Work visually and see exactly what your students will see. Reorganize your <strong>Learning Units</strong> with drag and drop.</p>
+              <p>Work visually and see exactly what your students will see. Reorganize all your content with drag and drop.</p>
             </li>
 
             <li class="proofpoint">
@@ -113,7 +113,7 @@
 
             <li class="proofpoint">
               <h4 class="title">Release-On Date Publishing</h4>
-              <p>When you've finished a <strong>Section</strong>, pick when you want it to go live and Studio takes care of the rest. Build your course incrementally.</p>
+              <p>When you've finished a <strong>section</strong>, pick when you want it to go live and Studio takes care of the rest. Build your course incrementally.</p>
             </li>
 
             <li class="proofpoint">