updated multicurrency
fixed merge conflict