Finish user signup
Finish sign in
Fix confict
Fix conflicts