fixed login
fixed merge conflict