Fix merging of an older file