fixed sign in
merged