merge
merge
prettify
take currency into account