resolve conflict

packages/app/src/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -164,6 +164,7 @@ const GrowiContextualSubNavigation = (props: GrowiContextualSubNavigationProps):
   const { data: currentUser } = useCurrentUser();
   const { data: isGuestUser } = useIsGuestUser();
   const { data: isSharedUser } = useIsSharedUser();
+  const { data: shareLinkId } = useShareLinkId();
 
   const { data: isAbleToShowPageManagement } = useIsAbleToShowPageManagement();
   const { data: isAbleToShowTagLabel } = useIsAbleToShowTagLabel();
@@ -306,11 +307,9 @@ const GrowiContextualSubNavigation = (props: GrowiContextualSubNavigationProps):
                 isCompactMode={isCompactMode}
                 pageId={pageId}
                 revisionId={revisionId}
-                // pageId={pageId}
-                // shareLinkId={shareLinkId}
-                // revisionId={revision.toString()}
+                shareLinkId={shareLinkId}
                 path={path}
-                // disableSeenUserInfoPopover={isSharedUser}
+                disableSeenUserInfoPopover={isSharedUser}
                 showPageControlDropdown={isAbleToShowPageManagement}
                 additionalMenuItemRenderer={additionalMenuItemsRenderer}
                 onClickDuplicateMenuItem={duplicateItemClickedHandler}