Add GA
Resolve conflicts