Fix merge conflicts

backend/src/controllers/v1/index.ts

@@ -16,7 +16,6 @@ import * as workspaceController from "./workspaceController";
 import * as secretScanningController from "./secretScanningController";
 import * as webhookController from "./webhookController";
 import * as secretImpsController from "./secretImpsController";
-import * as roleController from "./roleController";
 
 export {
   authController,
@@ -36,6 +35,5 @@ export {
   workspaceController,
   secretScanningController,
   webhookController,
-  roleController,
   secretImpsController
 };

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,
+  secretImps
-  role
 };