update ga setting
merge