add google-oath2
fixed conflicts