merge auth controller