Resolve merge conflicts

package-lock.json

package.json

src/renderer/components/Experiment/Eval/EvalJobsTable.tsx

src/renderer/components/Experiment/Workflows/index.tsx

src/renderer/components/MainAppPanel.tsx

src/renderer/components/Nav/Sidebar.tsx

src/renderer/components/TransformerLabSettings.tsx

src/renderer/lib/transformerlab-api-sdk.ts