Compelete SignIn

Signin
Checkout
fix conflict