# Conflicts:
#	package-lock.json
#	package.json
#	resources/js/app.tsx
#	resources/js/components/app-header.tsx
#	resources/js/components/nav-footer.tsx
#	resources/js/components/nav-main.tsx
#	resources/js/components/two-factor-setup-modal.tsx
#	resources/js/components/ui/sidebar.tsx
#	resources/js/hooks/use-mobile.tsx
#	resources/js/layouts/settings/layout.tsx
#	resources/js/pages/auth/confirm-password.tsx
#	resources/js/pages/auth/login.tsx
#	resources/js/pages/auth/register.tsx
#	resources/js/pages/auth/reset-password.tsx
#	resources/js/pages/auth/verify-email.tsx
#	resources/js/pages/settings/password.tsx