diff --git a/assets/scss/docsy_overrides.scss b/assets/scss/docsy_overrides.scss
index 159e76f..02a2e28 100644
--- a/assets/scss/docsy_overrides.scss
+++ b/assets/scss/docsy_overrides.scss
@@ -144,7 +144,6 @@ li:has(input[type="checkbox"]) {
     font-weight: 600;
 }
 
-<<<<<<< HEAD
 .tab-content {
     .tab-pane {
        border: none !important;
@@ -183,8 +182,6 @@ li:has(input[type="checkbox"]) {
     }
 }
 
-=======
->>>>>>> upstream/master
 @media (min-width: 768px)  {
     .td-sidebar {
         padding-top: 5rem;