fix login
fix conflict