diff --git a/containers/api/src/app.controller.ts b/containers/api/src/app.controller.ts
index 22d7ff29..d0e63fee 100644
--- a/containers/api/src/app.controller.ts
+++ b/containers/api/src/app.controller.ts
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   app.controller.ts                                  :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: apommier <apommier@student.42.fr>          +#+  +:+       +#+        */
+/*   By: sadjigui <sadjigui@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/06/17 01:00:00 by apommier          #+#    #+#             */
-/*   Updated: 2023/06/23 19:15:56 by apommier         ###   ########.fr       */
+/*   Updated: 2023/06/24 16:01:35 by sadjigui         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -177,13 +177,17 @@ export class AppController {
   @UseGuards(JwtAuthGuard)
   @Post('/nickname')
   async setNickname(@Request() req, @Body() data: any) {
-	// let user = req.user
-	// user.nickname = data.nickname
-	console.log(`user= ${req.user.username}`)
-	let user = await this.userService.findOne(req.user.username)
-	user.nickname = data.nickname;
-	// return await this.userService.getFriends(req.user.username);
-	return await this.userService.save(user);
+    // let user = req.user
+    // user.nickname = data.nickname
+    // console.log(user= ${req.user.username})
+    const taken = await this.userService.findNickname(data.nickname)
+	console.log("taken =", taken)
+	if (taken)
+        return (0);
+    let user = await this.userService.findOne(req.user.username)
+    user.nickname = data.nickname;
+    // return await this.userService.getFriends(req.user.username);
+    return await this.userService.save(user);
   }
 
   @UseGuards(JwtAuthGuard)
@@ -357,7 +361,6 @@ export class AppController {
 // import { prisma } from "../server";
 
 
-
 @Redirect('http://' + process.env.BASE_URL + '/token', 302)
 @Get('auth/login')
   async login2(@Req() request: Request) {
diff --git a/containers/api/src/users/users.service.ts b/containers/api/src/users/users.service.ts
index 1e078d57..4e5cc039 100644
--- a/containers/api/src/users/users.service.ts
+++ b/containers/api/src/users/users.service.ts
@@ -3,10 +3,10 @@
 /*                                                        :::      ::::::::   */
 /*   users.service.ts                                   :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
-/*   By: apommier <apommier@student.42.fr>          +#+  +:+       +#+        */
+/*   By: sadjigui <sadjigui@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/06/17 01:00:07 by apommier          #+#    #+#             */
-/*   Updated: 2023/06/21 01:31:44 by apommier         ###   ########.fr       */
+/*   Updated: 2023/06/24 00:28:33 by sadjigui         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,6 +18,7 @@ import { User } from '../model/user.entity';
 import { MatchLog } from '../model/user.entity';
 
 
+
 @Injectable()
 export class UsersService {
 	constructor(
@@ -36,6 +37,13 @@ export class UsersService {
 	async findAll(): Promise<User[]> {
 		return await this.userRepository.find();
 	}
+
+	async findNickname(username: string): Promise<User> {
+		console.log("nick in find =", username)
+		const ret= await this.userRepository.findOneBy({nickname: username});
+		console.log("ret noick=", ret )
+		return ret;
+	}
 	
 	async findOne(username: string): Promise<User> {
 		return await this.userRepository.findOneBy({username: username});
diff --git a/containers/react/src/components/Messages/Chats.tsx b/containers/react/src/components/Messages/Chats.tsx
index 116e7f79..513e936c 100644
--- a/containers/react/src/components/Messages/Chats.tsx
+++ b/containers/react/src/components/Messages/Chats.tsx
@@ -17,7 +17,11 @@ import { ImBlocked } from 'react-icons/im';
 import { MdOutlineGroupAdd } from 'react-icons/md';
 import { GrAdd } from 'react-icons/gr';
 import { RiListSettingsLine } from 'react-icons/ri'
+<<<<<<< Updated upstream
 import { HiChatBubbleLeft } from 'react-icons/hi2'
+=======
+import { LuCat } from 'react-icons/lu'
+>>>>>>> Stashed changes
 
 // import { Rank } from "../../DataBase/DataRank";
 import GreenAlert from "../Alert/GreenAlert.tsx";
@@ -28,7 +32,7 @@ import PartyInvite from "./PartyInvite.tsx";
 
 // import {User, Conv, Message} from "../../../interfaces.tsx"
 import {User, Conv} from "../../../interfaces.tsx"
-import { IoLogoOctocat } from "react-icons/io5";
+import { IoChatbox, IoLogoOctocat } from "react-icons/io5";
 
 const TouchDiv = styled.div`
 	margin-left: 10px;