update analytics domain
Resolve conflict