update ga
merge