merge
merge
added listItems, parsed JSON, altered ConversionVO and ConversionVOFactory