Finish sign in
Fixing merge