zfs: Fix an improperly resolved merge conflict
Approved by: so Fixes: 8838c650cb59 ("Fix use-after-free in btree code")