clientcurrencyrate
clientsidechanges
merge conflicts resolved