Correct stamp logic and update Merchant Service to save to db.