delect login
fix conflict