login controller
merged conflict