diff --git a/libs/remix-ui/plugin-manager/src/types.d.ts b/libs/remix-ui/plugin-manager/src/types.d.ts
index 37ce6f659c..7e71f67815 100644
--- a/libs/remix-ui/plugin-manager/src/types.d.ts
+++ b/libs/remix-ui/plugin-manager/src/types.d.ts
@@ -180,7 +180,11 @@ export interface FormStateProps {
   hash: string
   methods: any
   location: string
+<<<<<<< HEAD
   canActivate?: any
+=======
+  canActivate: any
+>>>>>>> ceb5496f4 (fix whitespaces and canactivate)
 }
 
 export type PluginManagerProfile = Profile & {