Added in logic for logout
Resolving conflicts