Fixed currency updates
Updated merge