fixed merchant_checkin