merged google authentication with user authentication'