login controller
merge conflicts