Fix incorrect file adding during merge.