feat(rbac): resolved merge conflict

backend/src/routes/v1/integration.ts

@@ -1,8 +1,6 @@
 import express from "express";
 const router = express.Router();
-import {
-  requireAuth
-} from "../../middleware";
+import { requireAuth } from "../../middleware";
 import { AuthMode } from "../../variables";
 import { integrationController } from "../../controllers/v1";
 

backend/src/routes/v2/environment.ts

@@ -23,18 +23,8 @@ router.put(
 router.patch(
   "/:workspaceId/environments",
   requireAuth({
-    acceptedAuthModes: [AuthMode.JWT, AuthMode.API_KEY],
+    acceptedAuthModes: [AuthMode.JWT, AuthMode.API_KEY]
   }),
-  requireWorkspaceAuth({
-    acceptedRoles: [ADMIN, MEMBER],
-    locationWorkspaceId: "params",
-  }),
-  param("workspaceId").exists().trim(),
-  body("environmentSlug").exists().isString().trim(),
-  body("environmentName").exists().isString().trim(),
-  body("otherEnvironmentSlug").exists().isString().trim(),
-  body("otherEnvironmentName").exists().isString().trim(),
-  validateRequest,
   environmentController.reorderWorkspaceEnvironments
 );