currencyrate
deductionmaster issues
allchanges
resolved merge conflict after merging