Fix spiff merge on properties.cf