feat: resolved merge conflicts

frontend/src/views/SecretMainPage/components/SecretListView/SecretItem.tsx

@@ -308,7 +308,12 @@ export const SecretItem = memo(
                 </Tooltip>
                 <ProjectPermissionCan
                   I={ProjectPermissionActions.Edit}
-                  a={subject(ProjectPermissionSub.Secrets, { environment, secretPath, secretName, secretTags: selectedTagSlugs})}
+                  a={subject(ProjectPermissionSub.Secrets, {
+                    environment,
+                    secretPath,
+                    secretName,
+                    secretTags: selectedTagSlugs
+                  })}
                 >
                   {(isAllowed) => (
                     <Modal>
@@ -335,7 +340,7 @@ export const SecretItem = memo(
                         </IconButton>
                       </ModalTrigger>
                       <ModalContent
-                        title="Secret Reference Tree"
+                        title="Secret Reference Details"
                         subTitle="Visual breakdown of secrets referenced by this secret."
                       >
                         <SecretReferenceTree

frontend/src/views/SecretMainPage/components/SecretReferenceDetails/SecretReferenceDetails.tsx

@@ -106,8 +106,8 @@ export const SecretReferenceTree = ({ secretPath, environment, secretKey }: Prop
           </ul>
         )}
       </div>
-      <div className="mt-2 text-sm text-gray-400">
-        Click on a secret key to view its corresponding sub references.
+      <div className="mt-2 text-sm text-mineshaft-400">
+        Click a secret key to view its sub-references.
       </div>
     </div>
   );

frontend/src/views/SecretOverviewPage/components/SecretOverviewTableRow/SecretEditRow.tsx

@@ -248,7 +248,7 @@ export const SecretEditRow = ({
                       </div>
                     </ModalTrigger>
                     <ModalContent
-                      title="Secret Reference Tree"
+                      title="Secret Reference Details"
                       subTitle="Visual breakdown of secrets referenced by this secret."
                     >
                       <SecretReferenceTree