viced: fix merge error