diff --git a/htdocs/index.js b/htdocs/index.js
index a534d6006801df041390451ae2c260316fcc8c0b..bf537a11a8afa7044137f6f8731e1a0fd75766db 100644
--- a/htdocs/index.js
+++ b/htdocs/index.js
@@ -693,6 +693,7 @@ function movePiece(piece, newRow, newCol) {
                 piece: selectedPiece            // Nom de la pièce (ex: "pion", "tour", etc.)
             }
         });
+<<<<<<< Updated upstream
 
         if (echec(board)){
             socket.emit('echec');