diff --git a/src/shared/themed-bootstrap.css b/src/shared/themed-bootstrap.css
index 734625c6..2f98d3d0 100644
--- a/src/shared/themed-bootstrap.css
+++ b/src/shared/themed-bootstrap.css
@@ -12616,7 +12616,7 @@ strong {
   font-weight: 700;
 }
 
-<<<<<<< HEAD ======= @media (max-width: 991.98px) {
+@media (max-width: 991.98px) {
   thead.table-stacked {
     position: absolute;
     left: -10000px;