@@ -418,12 +418,6 @@ <h4>IP Address Tracker</h4>
       </a>
     </div>
     <div class="item">
-<<<<<<< HEAD
-      <a target="_blank" href="68 - Ping Pong Game/index.html">
-        <img src="30DaysOfJavaScript/assets/68.png" alt="Ping Pong Game" />
-        <h4>Ping Pong Game</h4>
-    </div>
-=======
       <a target="_blank" href="63 - URL Bookmark/index.html">
         <img src="30DaysOfJavaScript/assets/63.png" alt="URL Bookmark" />
         <h4>URL Bookmark</h4>
@@ -565,11 +559,16 @@ <h4>Menu Filter</h4>
         <h4>Weight Conversion Tool</h4>
       </a>
     </div>
+    <div class="item">
+      <a target="_blank" href="88 - Ping Pong Game/index.html">
+        <img src="30DaysOfJavaScript/assets/88.png" alt="Ping Pong Game" />
+        <h4>Ping Pong Game</h4>
+      </a>
+    </div>
   </div>
   </div>
   </div>
   <!-- Main Section End -->
->>>>>>> 9d4b23200a5d7382ede369977b5f0e37bc004ce7
 
   <!-- Footer Start -->
   <footer>