diff --git a/frontend/src/api/users.ts b/frontend/src/api/users.ts
index bf82f76e..35827f4c 100644
--- a/frontend/src/api/users.ts
+++ b/frontend/src/api/users.ts
@@ -23,11 +23,7 @@ export async function create(user: IUser) {
   }
 }
 
-<<<<<<< HEAD
-export async function update(user: User, which = ["all"]) {
-=======
 export async function update(user: IUser, which = ["all"]) {
->>>>>>> vue3-bak
   await fetchURL(`/api/users/${user.id}`, {
     method: "PUT",
     body: JSON.stringify({