diff --git a/assets/gameboard-easy.js b/assets/gameboard-easy.js
index c1d6ae8..34c427c 100644
--- a/assets/gameboard-easy.js
+++ b/assets/gameboard-easy.js
@@ -124,6 +124,7 @@ function startTimer() {
   }, 1000);
 }
 
+// --- FUNGSI END SCREEN (YANG DI-UPDATE) ---
 function showEndScreen(isWin) {
     clearInterval(countdown);
     bgMusic.pause();
@@ -137,11 +138,42 @@ function showEndScreen(isWin) {
     let moveBonus = isWin ? Math.max(0, 200 - moves * 10) : 0;
     let total = baseScore + timeBonus + moveBonus;
 
+<<<<<<< HEAD
     document.getElementById("baseScoreEnd").textContent = baseScore;
     document.getElementById("timeBonusEnd").textContent = "+" + timeBonus;
     document.getElementById("moveBonusEnd").textContent = "+" + moveBonus;
     document.getElementById("totalScoreEnd").textContent = total;
     document.getElementById("endScreen").style.display = "flex";
+=======
+  let baseScore = score;
+  let timeBonus = time * 5;
+  let moveBonus = Math.max(0, 200 - moves * 10);
+  let total = baseScore + timeBonus + moveBonus;
+
+  document.getElementById("baseScoreEnd").textContent = baseScore;
+  document.getElementById("timeBonusEnd").textContent = "+" + (isWin ? timeBonus : 0);
+  document.getElementById("moveBonusEnd").textContent = "+" + (isWin ? moveBonus : 0);
+  document.getElementById("totalScoreEnd").textContent = isWin ? total : baseScore;
+
+  // --- KIRIM SCORE KE DATABASE ---
+  if (isWin) {
+      // Bungkus data score
+      let formData = new FormData();
+      formData.append('score', total);
+
+      // Kirim ke score.php (tanpa reload halaman)
+      fetch('score.php', {
+          method: 'POST',
+          body: formData
+      })
+      .then(response => response.text())
+      .then(result => console.log("Status Simpan Score: " + result))
+      .catch(error => console.error('Error:', error));
+  }
+  // ------------------------------
+
+  document.getElementById("endScreen").style.display = "flex";
+>>>>>>> 43b6ab58ae77611b561af08efaf30f5d542b0ebc
 }
 
 function flipCard(card) {
diff --git a/score.php b/score.php
index 15f55c9..e5d6264 100644
--- a/score.php
+++ b/score.php
@@ -1,5 +1,6 @@
 <?php
 session_start();
+<<<<<<< HEAD
 include 'Config.php'; // Pastikan koneksi database benar
 
 // Kita cek apakah $_SESSION['user'] ada (Sama persis kayak di Mainboard)
@@ -13,6 +14,13 @@ if (isset($_SESSION['user']) && isset($_POST['score'])) {
     // (Biasanya key-nya 'id' kalau dari database, sesuaikan jika kamu pakai 'user_id')
     $user_id = $userData['id']; 
     
+=======
+include 'Config.php'; // Sambungkan ke database
+
+if (isset($_SESSION['user_id']) && isset($_POST['score'])) {
+    
+    $user_id = $_SESSION['user_id'];
+>>>>>>> 43b6ab58ae77611b561af08efaf30f5d542b0ebc
     $score = intval($_POST['score']); 
 
     // Masukkan ke database
@@ -20,11 +28,18 @@ if (isset($_SESSION['user']) && isset($_POST['score'])) {
     $stmt->bind_param("ii", $user_id, $score);
     
     if ($stmt->execute()) {
+<<<<<<< HEAD
         echo "Berhasil simpan skor untuk ID: " . $user_id;
     } else {
         echo "Gagal: " . $conn->error;
     }
 } else {
     echo "Error: Belum login atau Data Session tidak sesuai.";
+=======
+        echo "Berhasil";
+    } else {
+        echo "Gagal";
+    }
+>>>>>>> 43b6ab58ae77611b561af08efaf30f5d542b0ebc
 }
 ?>
\ No newline at end of file