feat(rbac): resolved merge conflict

backend/src/validation/environments.ts

@@ -35,3 +35,15 @@ export const GetAllAccessibileEnvironmentsOfWorkspaceV2 = z.object({
     workspaceId: z.string().trim()
   })
 });
+
+export const ReorderWorkspaceEnvironmentsV2 = z.object({
+  params: z.object({
+    workspaceId: z.string().trim()
+  }),
+  body: z.object({
+    environmentSlug: z.string().trim(),
+    environmentName: z.string().trim(),
+    otherEnvironmentSlug: z.string().trim(),
+    otherEnvironmentName: z.string().trim()
+  })
+});

backend/src/validation/integration.ts

@@ -99,3 +99,10 @@ export const DeleteIntegrationV1 = z.object({
     integrationId: z.string().trim()
   })
 });
+
+export const ManualSyncV1 = z.object({
+  body: z.object({
+    environment: z.string(),
+    workspaceId: z.string()
+  })
+});