#19 twit login
fix conflict