diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css
index 4ee29652c446fbba20881163cce31b65d6b86717..6cf9f7bb7119ce9ef15879b575819c684e6d5556 100644
--- a/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sun Aug 21 20:53:42 PDT 2011
+ * Date: Sun Aug 21 20:55:56 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
diff --git a/docs/index.html b/docs/index.html
index 983ea7d87165f8efbd7e1338b3e8c536741dac10..263ccc3eddb754e5cf2a8d378fd3a1db0327a842 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -900,35 +900,12 @@
   <div class="page-header">
     <h1>Navigation</h1>
   </div>
+
   <h2>Fixed topbar</h2>
   <div class="topbar-wrapper" style="z-index: 5;">
     <div class="topbar">
-      <div class="container">
-        <h3><a href="#">Project Name</a></h3>
-        <ul>
-          <li class="active"><a href="#">Home</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-          <li><a href="#">Link</a></li>
-        </ul>
-        <form action="">
-          <input type="text" placeholder="Search" />
-        </form>
-        <ul class="nav secondary-nav">
-          <li class="menu">
-            <a href="#" class="menu">Dropdown</a>
-            <ul class="menu-dropdown">
-              <li><a href="#">Secondary link</a></li>
-              <li><a href="#">Something else here</a></li>
-              <li class="divider"></li>
-              <li><a href="#">Another link</a></li>
-            </ul>
-          </li>
-        </ul>
-=======
->>>>>>> .merge_file_ugVE3k
       <div class="fill">
-        <div class="container fixed">
+        <div class="container">
           <h3><a href="#">Project Name</a></h3>
           <ul>
             <li class="active"><a href="#">Home</a></li>
@@ -951,9 +928,10 @@
             </li>
           </ul>
         </div>
-      </div>
-    </div>
+      </div> <!-- /fill -->
+    </div> <!-- /topbar -->
   </div> <!-- topbar-wrapper -->
+
   <div class="row">
     <div class="span5 columns">
       <h4>What is it</h4>