Finish sign in sign out
fix conflicts