diff --git a/assets/gameboard-easy.js b/assets/gameboard-easy.js
index 757c8f5..fcd5640 100644
--- a/assets/gameboard-easy.js
+++ b/assets/gameboard-easy.js
@@ -139,6 +139,7 @@ function showEndScreen(isWin) {
     document.getElementById("moveBonusEnd").textContent = "+" + moveBonus;
     document.getElementById("totalScoreEnd").textContent = total;
     document.getElementById("endScreen").style.display = "flex";
+<<<<<<< HEAD
 
     
     if (isWin) {
@@ -153,6 +154,8 @@ function showEndScreen(isWin) {
         .then(result => console.log("Status Database: " + result))
         .catch(error => console.error('Error:', error));
     }
+=======
+>>>>>>> dd08ea599df1d676b68b773a1b6ad44356bf1b64
 }
 
 function flipCard(card) {