Updating client to support new domain
Resolve conflicts