Fixed issue with merge

data/mocks.ts

@@ -148,15 +148,3 @@ export const mockQuoteDataLong = [
   "Hello, world!",
   "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla in enim neque. Sed sit amet convallis tellus. Integer condimentum a felis id gravida. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nullam metus libero, sagittis in consectetur in, scelerisque sed sapien. Nullam ut feugiat sapien. Praesent dictum ac ipsum ac lacinia.",
 ];
-
-export const mockQuoteData = [
-  "The quick brown fox jumps over the lazy dog.",
-  "Sphinx of black quartz, judge my vow!",
-  "Pack my box with five dozen liquor jugs.",
-];
-
-export const mockQuoteDataLong = [
-  "Here, have some quotes of varying lengths, and see how they look.",
-  "Hello, world!",
-  "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla in enim neque. Sed sit amet convallis tellus. Integer condimentum a felis id gravida. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Nullam metus libero, sagittis in consectetur in, scelerisque sed sapien. Nullam ut feugiat sapien. Praesent dictum ac ipsum ac lacinia.",
-];

pages/_app.css

@@ -125,10 +125,6 @@ a:hover {
   color: var(--link-hover);
 }
 
-p {
-  font-size: calc(28rem / 16);
-}
-
 @media only screen and (prefers-color-scheme: dark) {
   body {
     --primary-background: var(--dark--primary-background);
@@ -149,4 +145,4 @@ p {
     --card-background: var(--dark--card-background);
     --label: var(--dark--label);
   }
-}
+}

pages/playground.tsx

@@ -167,23 +167,6 @@ export default function Home() {
           circleDiameter={180}
         />
       </div>
-
-      <h2>
-        <code>{"<QuotationCarousel />"}</code>
-      </h2>
-      <div className={styles.quotationCarouselDemo}>
-        <QuotationCarousel data={mockQuoteData} circleDiameter={0} />
-        <QuotationCarousel
-          data={mockQuoteDataLong}
-          width={800}
-          height={160}
-          circleDiameter={180}
-        />
-      </div>
-      <h2>
-        <code>{"<Sections />"}</code>
-        <Sections data={sectionsData} />
-      </h2>
     </div>
   );
 }