exchange rate test
merge conflict fix