fixing login controller merge