diff --git a/commands/core/list.js b/commands/core/list.js
index 9926a53..3394bd5 100644
--- a/commands/core/list.js
+++ b/commands/core/list.js
@@ -7,11 +7,7 @@ const openai = new OpenAI({
 });
 
 const getAssistants = async () => {
-<<<<<<< Updated upstream
 	const assistants = await openai.beta.assistants.list();
-=======
-	const payload = await openai.beta.assistants.list();
->>>>>>> Stashed changes
 	const data = [];
 	for (let i = 0; i < assistants.data.length; i++) {
 		const text = `${assistants.data[i].name} (${assistants.data[i].model})`;