modified signin to return full user object
resolved conflict