merchant fixes