Add check to etcmerge, skip files we have nuked during merge