Resolve merge conflicts

frontend/src/pages/dashboard/[id].tsx

@@ -219,8 +219,7 @@ export default function Dashboard() {
     (async () => {
       if (router.isReady && workspaceId === 'undefined') {
         router.push('/noprojects');
-      }
-      try {
+      } else try {
         const { push, query } = router
         const tempNumSnapshots = await getProjectSercetSnapshotsCount({
           workspaceId

frontend/src/pages/login.tsx

@@ -33,7 +33,7 @@ export default function Login() {
       let userWorkspace;
       try {
         const userWorkspaces = await getWorkspaces();
-        userWorkspace = userWorkspaces[0]._id;
+        userWorkspace = userWorkspaces[0] && userWorkspaces[0]._id;
         router.push(`/dashboard/${userWorkspace}`);
       } catch (error) {
         console.log('Error - Not logged in yet');
@@ -90,7 +90,7 @@ export default function Login() {
           <ListBox
             isSelected={lang}
             onChange={setLanguage}
-            data={['en', 'ko', 'fr', 'pt-BR', 'pt-PT']}
+            data={['en', 'ko', 'fr', 'pt-BR']}
             isFull
             text={`${t('common:language')}: `}
           />

frontend/src/pages/settings/personal/[id].tsx

@@ -96,7 +96,7 @@ export default function PersonalSettings() {
                 <ListBox
                   isSelected={lang}
                   onChange={setLanguage}
-                  data={['en', 'ko', 'fr']}
+                  data={['en', 'ko', 'fr', 'es']}
                   text={`${t('common:language')}: `}
                 />
               </div>