showing new currency in the browser with ajax
merge conflict resolution