Add GA code
Fix merge conflict