Fix merge conflicts

backend/src/routes/v3/secrets.ts

@@ -5,15 +5,4 @@ import {
 } from '../../middleware';
 import { body } from 'express-validator';
 
-router.post(
-    '/',
-    body('workspaceId').exists().isString().trim(),
-    body('environment').exists().isString().trim(),
-    body('secretType').exists().isString(),
-    validateRequest,
-    async (req, res) => {
-        return;
-    }
-);
-
 export default router;