diff --git a/srcs/channel.cpp b/srcs/channel.cpp
index 3374aae..87cc8ef 100644
--- a/srcs/channel.cpp
+++ b/srcs/channel.cpp
@@ -6,11 +6,7 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/21 10:36:21 by maldavid          #+#    #+#             */
-<<<<<<< Updated upstream
-/*   Updated: 2024/01/30 21:01:06 by maldavid         ###   ########.fr       */
-=======
-/*   Updated: 2024/01/30 20:39:37 by vvaas            ###   ########.fr       */
->>>>>>> Stashed changes
+/*   Updated: 2024/01/30 21:06:03 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/
 
@@ -75,18 +71,13 @@ namespace irc
 			client->sendCode(ERR_USERNOTINCHANNEL, "User not in channel");
 	}
 
-<<<<<<< Updated upstream
 	bool Channel::removeClient(unstd::SharedPtr<Client> client, const std::string& reason, bool quit)
-=======
-	bool Channel::removeClient(unstd::SharedPtr<Client> client)
->>>>>>> Stashed changes
 	{
 		if(!_clients.erase(client))
 			return (false);
 		if(isOp(client))
 			_operators.erase(client);
 		for(client_it it = _clients.begin(); it != _clients.end(); ++it)
-<<<<<<< Updated upstream
 		{
 			if(!quit)
 				const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "PART", _name + ' ' + reason);
@@ -96,11 +87,6 @@ namespace irc
 		if(!quit)
 			client->sendMsg(client->getNickName(), "PART", _name + ' ' + reason);
 		return true;
-=======
-			const_cast<unstd::SharedPtr<irc::Client>&>(*it)->sendMsg(client->getNickName(), "PART", _name);
-		client->sendMsg(client->getNickName(), "PART", _name);
-		return (true);
->>>>>>> Stashed changes
 	}
 
 	void Channel::sendWho(unstd::SharedPtr<Client> client)
diff --git a/srcs/server.cpp b/srcs/server.cpp
index 8b398cd..ae067ee 100644
--- a/srcs/server.cpp
+++ b/srcs/server.cpp
@@ -6,11 +6,7 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/21 09:31:17 by maldavid          #+#    #+#             */
-<<<<<<< Updated upstream
-/*   Updated: 2024/01/30 20:58:31 by maldavid         ###   ########.fr       */
-=======
-/*   Updated: 2024/01/30 20:27:37 by vvaas            ###   ########.fr       */
->>>>>>> Stashed changes
+/*   Updated: 2024/01/30 21:06:26 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/
 
diff --git a/srcs/server_functions.cpp b/srcs/server_functions.cpp
index 6b37682..6e8bd90 100644
--- a/srcs/server_functions.cpp
+++ b/srcs/server_functions.cpp
@@ -6,11 +6,7 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/22 17:31:06 by maldavid          #+#    #+#             */
-<<<<<<< Updated upstream
-/*   Updated: 2024/01/30 21:01:20 by maldavid         ###   ########.fr       */
-=======
-/*   Updated: 2024/01/30 20:39:22 by vvaas            ###   ########.fr       */
->>>>>>> Stashed changes
+/*   Updated: 2024/01/30 21:05:17 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/