Merge conflicts

frontend/src/pages/chat/chat.ts

@@ -31,7 +31,6 @@ export type blockedUnBlocked =
 	by: string,
 };
 
-
 // get the name of the machine used to connect
 const machineHostName = window.location.hostname;
 console.log('connect to login at %chttps://' + machineHostName + ':8888/app/login',color.yellow);

src/chat/src/app.ts

@@ -388,6 +388,7 @@ async function onReady(fastify: FastifyInstance) {
 			console.log(color.yellow, UserToBlock);
 			console.log(color.yellow, `user Asking to block: ${profilBlock.SenderName}`);
 			console.log(color.yellow, UserAskingToBlock);
+			console.log(color.red, clientName);
 
 			if (!UserAskingToBlock || !UserToBlock) return;