Finished sign in sign out
resolve conflict