started with login page
finish done page
fix conflict