service auth code merged