Update error_analysis/utils/style_hacks.py

error_analysis/utils/style_hacks.py

@@ -1,5 +1,5 @@
 """
- placeholder for all streamlit style hacks
+ streamlit style hacks
 """
 import streamlit as st
 
@@ -25,7 +25,7 @@ def init_style():
         width:10rem;
         padding:10px 10px 10px 10px;
     }
-    
+
     /* Main Panel*/ 
     [data-testid="stVerticalBlock"]{
         margin-left: -200px;
@@ -65,11 +65,7 @@ def init_style():
     .sectionHeader {
         font-size:10px;
     }
-<<<<<<< HEAD
     [data-testid="stMarkdownContainer]{
-=======
-    .heading-1 {
->>>>>>> c3dcac87ad5f4367f179e8d63e26acdc5aeaf7f0
         font-family: sans-serif;
         font-weight: 500;
         font-size: 1.5 rem !important;