diff --git a/12/style.css b/12/style.css
index 8a69e10..694d637 100644
--- a/12/style.css
+++ b/12/style.css
@@ -835,9 +835,16 @@ filter: invert(1);
   background-color:;
   color:#6dc82a;
   float: left;
+<<<<<<< HEAD
   font-size: 34px;
   font-style: italic;
  
+=======
+}
+
+#table_content_06{
+  width:35%;
+>>>>>>> bdec260680cb934f1a5a8645100ccb4852c29a96
 }
 
 #table_content_06 >ul {
@@ -995,9 +1002,8 @@ div.c_downclock{
   margin-top: 55px;
   margin-right: 45px;
   z-index: -10;
-
 }
 
 #implicancies_06 .now_playing{
-  background-color: darkblue;
+  background-color: rgba(0,0,139, 0.5);
 }