Fix merge conflicts

frontend/pages/home/[id].tsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
+import { useTranslation } from "next-i18next";
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { faSlack } from '@fortawesome/free-brands-svg-icons';
 import {
@@ -15,6 +16,7 @@ import {
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 
 import onboardingCheck from '~/components/utilities/checks/OnboardingCheck';
+import { getTranslatedServerSideProps } from '~/components/utilities/withTranslateProps';
 
 import registerUserAction from '../api/userActions/registerUserAction';
 
@@ -139,6 +141,8 @@ export default function Home() {
   const [hasUserPushedSecrets, setHasUserPushedSecrets] = useState(false);
   const [usersInOrg, setUsersInOrg] = useState(false);
 
+  const { t } = useTranslation();
+
   useEffect(() => {
     onboardingCheck({
       setHasUserClickedIntro,
@@ -226,3 +230,5 @@ export default function Home() {
 }
 
 Home.requireAuth = true;
+
+export const getServerSideProps = getTranslatedServerSideProps(["home"]);