# Conflicts: # frontend/src/App.tsx # frontend/src/pages/Auth/LoginPage.tsx # frontend/src/pages/Wizard/WizardPage.tsx