new version
fix conflicts in login view controller