diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d7a70bff..6f55cef9 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/javascript.html b/docs/javascript.html
index 03440290..b3f38921 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1456,7 +1456,6 @@ $('.myCarousel').carousel({
       </div>
     </section>
 
-<<<<<<< HEAD
 
 
     <!-- Placeholder