diff --git a/backend/src/db/migrations/20240223184912_ldap-config.ts b/backend/src/db/migrations/20240305165532_ldap-config.ts
similarity index 100%
rename from backend/src/db/migrations/20240223184912_ldap-config.ts
rename to backend/src/db/migrations/20240305165532_ldap-config.ts
diff --git a/backend/src/server/routes/index.ts b/backend/src/server/routes/index.ts
index 9c0e90a6e..45edf87e5 100644
--- a/backend/src/server/routes/index.ts
+++ b/backend/src/server/routes/index.ts
@@ -238,7 +238,6 @@ export const registerRoutes = async (
     smtpService
   });
 
-<<<<<<< HEAD
   const ldapService = ldapConfigServiceFactory({
     ldapConfigDAL,
     orgDAL,
@@ -248,8 +247,6 @@ export const registerRoutes = async (
     licenseService
   });
 
-  const telemetryService = telemetryServiceFactory();
-=======
   const telemetryService = telemetryServiceFactory({
     keyStore,
     licenseService
@@ -260,7 +257,6 @@ export const registerRoutes = async (
     queueService
   });
 
->>>>>>> origin
   const tokenService = tokenServiceFactory({ tokenDAL: authTokenDAL, userDAL });
   const userService = userServiceFactory({ userDAL });
   const loginService = authLoginServiceFactory({ userDAL, smtpService, tokenService });