# Conflicts: # src-tauri/.cargo/config.toml # src-tauri/Cargo.toml # src-tauri/src/lib.rs # web-app/src/containers/__tests__/ChatInput.test.tsx # web-app/src/routeTree.gen.ts # web-app/src/routes/index.tsx # web-app/src/routes/threads/$threadId.tsx # yarn.lock