FIX Merchant z-order bug