Finish sign in
 Fix merge