Duplicate lines missed during merge