Fix merge conflicts

backend/src/routes/v1/index.ts

@@ -17,7 +17,6 @@ import integrationAuth from "./integrationAuth";
 import secretsFolder from "./secretsFolder";
 import webhooks from "./webhook";
 import secretImps from "./secretImps";
-import role from "./role";
 
 export {
   signup,
@@ -38,6 +37,5 @@ export {
   integrationAuth,
   secretsFolder,
   webhooks,
-  secretImps,
-  role
+  secretImps
 };