improve UX of login
fix conflits