update GA
fix conflict