Google Cal feature
fix conflict