diff --git a/src/styles/docs/docs-types.css b/src/styles/docs/docs-types.css
index 1c2a224..8be9bac 100644
--- a/src/styles/docs/docs-types.css
+++ b/src/styles/docs/docs-types.css
@@ -384,11 +384,7 @@ html.dark .typevariants {
   .typedocs-content {
     margin-inline: 1.272rem;
 
-<<<<<<< HEAD
-    &>p {
-=======
     & > p {
->>>>>>> 0525431 (fixed badges, sections, light theme dimming, added font pull from google api)
       margin-block: 1.217rem;
     }
   }