diff --git a/htdocs/index.js b/htdocs/index.js
index 7538cd386199250fc6efad855d1cd4e95fa504d5..91667c3df5c60e6907892ff419804c11cfd15d7a 100644
--- a/htdocs/index.js
+++ b/htdocs/index.js
@@ -791,7 +791,6 @@ function estEchecEtMat(pieceAttack , rowPiece, colPiece) {
     if (player.isBlackPlayer===true){
         [kingRow, kingCol] = find_pieces("K", board);
     }
-<<<<<<< Updated upstream
     else{
         [kingRow, kingCol] = find_pieces("k", board);
     }
@@ -902,7 +901,6 @@ function peutIntercepter(kingRow, kingCol, board, attaquant, movesAttaquant) {
     }
     return false;
 }
-=======
 
 
 socket.on('update-timer', (gameState) => {
@@ -910,4 +908,3 @@ socket.on('update-timer', (gameState) => {
     document.getElementById('player2-time').textContent = gameState.player2.time;
     });
 
->>>>>>> Stashed changes