Resolve merge conflict

diff --cc docs/pages/index.md
index f59f9d5e636ed1f24ef34c87fd8ea6d58569df5a,8cc8291b8a2fe6f2e98509fa93fee15c5ee7986b..d490c9db03e2fc5cf463491b09ad17f350d73665
--- 1/docs/pages/index.md
--- 2/docs/pages/index.md
+++ b/docs/pages/index.md
@@@ -24,14 -16,16 +24,16 @@@ There are a number of ways to install F
  
  ## New to Foundation for Sites?
  
 -With an easy to understand syntax and consistent structure, you'll learn your way around Foudnation in no time!
 +With an easy to understand syntax and consistent structure, you'll learn your way around Foundation in no time!
  
 -<ul class="accordion" data-accordion>
 -  <li class="accordion-item welcome-accordion-item is-active" data-accordion-item>
 +<ul class="accordion welcome-accordion" data-accordion data-allow-all-closed="true">
 +  <li class="accordion-item welcome-accordion-item" data-accordion-item>
      <a href="#" class="accordion-title">Intro Videos</a>
-     <div class="accordion-content " data-tab-content>
  
-       <div class="row">
+     <div class="accordion-content" data-tab-content>
+ 
+       <div class="row accordion-content-item">
+ 
          <div class="medium-4 columns">
            <img src="http://placehold.it/350x250">
          </div>