merge social_sign_in into sign_in