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