Fix merge conflicts

backend/src/ee/routes/v1/secret.ts

@@ -2,7 +2,7 @@ import express from 'express';
 const router = express.Router();
 import {
     requireAuth,
-    requireWorkspaceAuth,
+	requireSecretAuth,
     validateRequest
 } from '../../../middleware';
 import { body, query, param } from 'express-validator';
@@ -14,7 +14,7 @@ router.get(
 	requireAuth({
 		acceptedAuthModes: ['jwt']
 	}),
-	requireWorkspaceAuth({
+	requireSecretAuth({
 		acceptedRoles: [ADMIN, MEMBER],
 		acceptedStatuses: [COMPLETED, GRANTED]
 	}),