trying to merge buttons and nav bar

index.html

@@ -7,7 +7,7 @@
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <link rel="icon" href="./res/player.png"/>
+        <link rel="icon" href="./res/mario.png"/>
         <!-- Place favicon.ico in the root directory -->
         <link rel="stylesheet" href="./style.css"/>
 
@@ -21,18 +21,15 @@
             your experience.
             </p>
         <![endif]-->
-<<<<<<< HEAD
         <nav>
             <ol id="level-lists">
             </ol>
         </nav>
-=======
         <div id="timer">Time</div>
         <button id="Pause" onclick="Pause()">Pause</button>
         <br>
         <div></div>
         <canvas id="canvas" width="800" height="400"></canvas>
->>>>>>> 380cebd36dc4e3a1f3af185d1a7e3f0adb3e04d1
         <div class="to-center">
             <canvas id="canvas" width="800" height="400"></canvas>
             <div class="text-bubble">

script.js

@@ -7,11 +7,7 @@ fillLevelSelection();
 let canvas = document.getElementById('canvas');
 let ctx = canvas.getContext('2d');
 window.ctx = ctx
-<<<<<<< HEAD
 let playground = generatePlayground(levelsBlueprint[0], canvas.width, canvas.height);
-=======
-let playground = generatePlayground(level2Blueprint, canvas.width, canvas.height);
->>>>>>> 380cebd36dc4e3a1f3af185d1a7e3f0adb3e04d1
 window.addEventListener("keydown", (event) => {
   if (!event.defaultPrevented) {
     switch (event.key) {