Added signin and signout function
Fixed conflicts