diff --git a/Homepage.html b/Homepage.html
index c133195..8525e36 100644
--- a/Homepage.html
+++ b/Homepage.html
@@ -1,7 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<<<<<<< HEAD
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>2048</title>
@@ -43,107 +42,5 @@
             <button class="btn" id="tryAgainBtn">Try Again</button>
         </div>
     </div>
-=======
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Homepage - 2048</title>
-  <link rel="stylesheet" href="Homepage.css">
-</head>
-<body>
-  <!-- Neon Particles Background -->
-  <div id="particles"></div>
-
-  <!-- Header -->
-  <header>
-    <div class="logo">2048</div>
-    <div class="nav-buttons">
-      <a href="Login.html" class="btn btn-secondary">Login</a>
-      <a href="Register.html" class="btn btn-primary">Register</a>
-    </div>
-  </header>
-
-  <!-- Hero Section -->
-  <section class="hero">
-    <div class="hero-title">2048</div>
-    <p class="hero-subtitle">Join the tiles, reach 2048</p>
-    <div class="cta-buttons">
-      <a href="2048.html" class="btn btn-cta btn-play">Play Now</a>
-      <a href="leaderboard.html" class="btn btn-cta btn-leaderboard">🏆 Leaderboard</a>
-    </div>
-  </section>
-
-  <!-- Features -->
-  <section class="features">
-    <h2 class="section-title">Game Features</h2>
-    <div class="features-grid">
-      <div class="feature-card">
-        <div class="feature-icon" style="color: #00eaff;">🎮</div>
-        <h3>Responsive Controls</h3>
-        <p>Play using arrow keys or WASD controls with smooth tile animations and instant feedback</p>
-      </div>
-
-      <div class="feature-card">
-        <div class="feature-icon" style="color: #ff00ff;">✨</div>
-        <h3>Visual Effects</h3>
-        <p>Neon-themed interface with particle effects, combo animations, and dynamic color schemes</p>
-      </div>
-
-      <div class="feature-card">
-        <div class="feature-icon" style="color: #00ff99;">🎵</div>
-        <h3>Sound System</h3>
-        <p>Background music and sound effects with individual volume controls for complete customization</p>
-      </div>
-
-      <div class="feature-card">
-        <div class="feature-icon" style="color: #ffd700;">🏆</div>
-        <h3>Leaderboard</h3>
-        <p>Track high scores and compete with other players in a global ranking system</p>
-      </div>
-
-      <div class="feature-card">
-        <div class="feature-icon" style="color: #ff6b6b;">👤</div>
-        <h3>User System</h3>
-        <p>Register and login to save your progress and maintain your score history</p>
-      </div>
-
-      <div class="feature-card">
-        <div class="feature-icon" style="color: #a855f7;">📱</div>
-        <h3>Mobile Support</h3>
-        <p>Fully responsive design with touch swipe controls for mobile devices</p>
-      </div>
-    </div>
-  </section>
-
-  <!-- How to Play -->
-  <section class="how-to-play">
-    <h2 class="section-title">How to Play</h2>
-    <div class="steps">
-      <div class="step">
-        <div class="step-number">1</div>
-        <h3>Move Tiles</h3>
-        <p>Use arrow keys, WASD, or swipe to move tiles in any direction</p>
-      </div>
-
-      <div class="step">
-        <div class="step-number">2</div>
-        <h3>Merge Numbers</h3>
-        <p>When two tiles with the same number touch, they merge into one</p>
-      </div>
-
-      <div class="step">
-        <div class="step-number">3</div>
-        <h3>Reach 2048</h3>
-        <p>Keep merging tiles to reach the 2048 tile and win the game</p>
-      </div>
-    </div>
-  </section>
-
-  <!-- Footer -->
-  <footer>
-    <p>&copy; 2024 2048 NEON Game Project. Final Project Assignment.</p>
-  </footer>
-
-  <script src="Animation_Homepage.js"></script>
->>>>>>> 373b957e42992f6947521c3439b9e8fe29b6f827
 </body>
 </html>
\ No newline at end of file
