fixed problems
fixed changes
fixed merge conflict
Merge branch 'login'