fix pontential Deadline exceeded exception for the currency API.
fix merge error.