Fix mismerge from caf