add ga
fix
fix merge