diff --git a/app.js b/app.js
index c6a6ca9d587c64662f87e1b177f2ec2ca5f6f1b0..b85290b032dac8380924ad052f96a0707da84b61 100644
--- a/app.js
+++ b/app.js
@@ -68,6 +68,7 @@ io.on('connection', (socket) => {
     });
     socket.on('roque', (data) => {
         console.log(`[Server] Play reçu : ${JSON.stringify(data)}`);  // Debugging
+<<<<<<< Updated upstream
         socket.broadcast.emit('roque', data);  // On diffuse à tous les clients
     });
 
@@ -75,6 +76,11 @@ io.on('connection', (socket) => {
         socket.broadcast.emit('echec');
     });
         
+=======
+
+        socket.broadcast.emit('roque', data);  // On diffuse à tous les clients
+    });
+>>>>>>> Stashed changes
 
     socket.on('play again', (roomId) => {
         const room = rooms.find(r => r.id === roomId);