From 7ae787a35333bc3f12a8f4e7b91528573506e56b Mon Sep 17 00:00:00 2001
From: Zack <zack@zackbradshaw.com>
Date: Fri, 6 Oct 2023 12:10:32 -0500
Subject: [PATCH] fix: Resolve merge errors

Former-commit-id: 276cbea940e7f26bcf38e0b7b5ec060c815205c4
---
 swarms/swarms/groupchat.py | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/swarms/swarms/groupchat.py b/swarms/swarms/groupchat.py
index 79cf6944..734c8439 100644
--- a/swarms/swarms/groupchat.py
+++ b/swarms/swarms/groupchat.py
@@ -12,11 +12,7 @@ class GroupChat:
     workers: List[Worker]
     messages: List[Dict]
     max_rounds: int = 10
-<<<<<<< Updated upstream
-    admin_name: str = "Admin" #admin worker
-=======
     admin_name: str = "Admin"  # admin agent
->>>>>>> Stashed changes
 
     @property
     def worker_names(self) -> List[str]:
@@ -25,17 +21,10 @@ class GroupChat:
     
     def reset(self):
         self.messages.clear()
-<<<<<<< Updated upstream
-    
-    def worker_by_name(self, name: str) -> Worker:
-        """Find the next speaker baed on the message"""
-        return self.workers[self.worker_names.index(name)]
-=======
 
     def agent_by_name(self, name: str) -> Worker:
         """Find the next speaker baed on the message"""
         return self.agents[self.agent_names.index(name)]
->>>>>>> Stashed changes
     
     def next_worker(self, worker: Worker) -> Worker:
         """Returns the next worker in the list"""