added twitter login in progress
added twitter login
fix conflict