yahoo login working
fixed merge conflicts