diff --git a/quartz/styles/syntax.scss b/quartz/styles/syntax.scss
index ba20563..9bfff78 100644
--- a/quartz/styles/syntax.scss
+++ b/quartz/styles/syntax.scss
@@ -14,4 +14,4 @@ code[data-theme*=" "] span {
 
 [saved-theme="dark"] code[data-theme*=" "] span {
   color: var(--shiki-dark);
-}
+}
\ No newline at end of file
diff --git a/quartz/styles/variables.scss b/quartz/styles/variables.scss
index e2aecf4..fbdbc48 100644
--- a/quartz/styles/variables.scss
+++ b/quartz/styles/variables.scss
@@ -6,47 +6,4 @@ $topSpacing: 6rem;
 $fullPageWidth: $pageWidth + 2 * $sidePanelWidth;
 $boldWeight: 700;
 $semiBoldWeight: 600;
-$normalWeight: 400;
-<<<<<<< HEAD
-
-$mobileGrid: (
-  templateRows: "auto auto auto auto auto",
-  templateColumns: "auto",
-  rowGap: "5px",
-  columnGap: "5px",
-  templateAreas:
-    '"grid-sidebar-left"\
-      "grid-header"\
-      "grid-center"\
-      "grid-sidebar-right"\
-      "grid-footer"',
-);
-$tabletGrid: (
-  templateRows: "auto auto auto auto",
-  templateColumns: "#{$sidePanelWidth} auto",
-  rowGap: "5px",
-  columnGap: "5px",
-  templateAreas:
-    '"grid-sidebar-left grid-header"\
-      "grid-sidebar-left grid-center"\
-      "grid-sidebar-left grid-sidebar-right"\
-      "grid-sidebar-left grid-footer"',
-);
-$desktopGrid: (
-  templateRows: "auto auto auto",
-  templateColumns: "#{$sidePanelWidth} auto #{$sidePanelWidth}",
-  rowGap: "5px",
-  columnGap: "5px",
-  templateAreas:
-    '"grid-sidebar-left grid-header grid-sidebar-right"\
-      "grid-sidebar-left grid-center grid-sidebar-right"\
-      "grid-sidebar-left grid-footer grid-sidebar-right"',
-);
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> parent of b41a266 (merge upstream)
-=======
->>>>>>> parent of fd6c0cb (tweak)
-=======
->>>>>>> parent of fd6c0cb (tweak)
+$normalWeight: 400;
\ No newline at end of file