BFQ: Fix incorrect merge