af_iucv: Fix merge.