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