Add GA
Refactor
Resolve conflict