chore: resolve merge conflicts

src/App.vue

@@ -59,6 +59,9 @@ watch(colorScheme, (newValue) => {
     --main-content-padding-x: 30px;
     --main-content-padding-y: 40px;
     --main-content-padding: var(--main-content-padding-y) var(--main-content-padding-x);
+    min-height: 100vh;
+    display: flex;
+    flex-direction: column;
 }
 
 .main-content {
@@ -70,10 +73,4 @@ watch(colorScheme, (newValue) => {
         --main-content-padding-x: 15px;
     }
 }
-
-#app-wrapper {
-    min-height: 100vh;
-    display: flex;
-    flex-direction: column;
-}
 </style>