diff --git a/src/assets/css/custom.css b/src/assets/css/custom.css
index b3686152..a17d685e 100644
--- a/src/assets/css/custom.css
+++ b/src/assets/css/custom.css
@@ -1540,7 +1540,6 @@ h1.logo span {
   color: #bbb;
 }
 /* .dblock-ti{border-bottom:1px solid #bbb;padding-bottom:4px;} */
-<<<<<<< HEAD
 .dblock-ti span,
 .dblock-txt .ti {
   color: #f4f4f4;
@@ -1553,11 +1552,6 @@ h1.logo span {
 .dblock-txt-list + .dblock-txt-list {
   margin-top: 4px;
 }
-=======
-.dblock-ti span, .dblock-txt .ti{color:#f4f4f4;font-weight:500;display:block;}
-.dblock-txt{line-height: 1.2;}
-.dblock-txt-list + .dblock-txt-list{margin-top:4px;}
->>>>>>> 4f7f181e911d0e99ac69642af4e531a190325090
 /* .dblock-box .arrow {position:absolute;bottom:-10px;left:50%;transform: translateX(-50%);display:block;width: 0px;height: 0px;border-top:10px solid #283046;border-bottom:10px solid none;border-right: 10px solid transparent;border-left: 10px solid  transparent;} */
 .dblock-txt-list span {
   font-size: 10px;