Adds sign in and out
fix conflict
fixed new conflict