Add controller for login
Merge confilcts