diff --git a/src/handlers/account/index.ts b/src/handlers/account/index.ts
index 4c232c7..56f9a3f 100644
--- a/src/handlers/account/index.ts
+++ b/src/handlers/account/index.ts
@@ -59,7 +59,6 @@ export const getAccountByID = async (request: GetAccountRequest, reply: FastifyR
   }
 
   return account;
-<<<<<<< src/handlers/account/index.ts
 };
 
 export const getAccount = async (request: GetAccountRequest, reply: FastifyReply) => {
@@ -76,8 +75,6 @@ export const getAccount = async (request: GetAccountRequest, reply: FastifyReply
   }
 
   return account;
-=======
->>>>>>> src/handlers/account/index.ts
 };
 
 export const setAccountRole = async (request: SetAccountRoleRequest, reply: FastifyReply) => {