fix merge
tax frontend
fix merge
worldpay currency conversion