Handle google/non-google email conflict