merge request "Cash on delivery fee"