From 7f64de74b7156f03b1b46ea00168c8c210d6086e Mon Sep 17 00:00:00 2001
From: Jared He <66887902+jaredjhe@users.noreply.github.com>
Date: Wed, 7 Sep 2022 23:01:47 -0400
Subject: [PATCH] Merge main

---
 pages/playground.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pages/playground.tsx b/pages/playground.tsx
index a6b5bb5..06dfad7 100644
--- a/pages/playground.tsx
+++ b/pages/playground.tsx
@@ -72,11 +72,11 @@ export default function Home() {
       />
 
       <h2>
-<<<<<<< HEAD
         <code>{"<Sections />"}</code>
       </h2>
       <Sections data={sectionsData} />
-=======
+
+      <h2>
         <code>{"<BoxPlot />"}</code>
       </h2>
       <BoxPlot
@@ -101,7 +101,6 @@ export default function Home() {
           circleDiameter={180}
         />
       </div>
->>>>>>> main
     </div>
   );
 }