took out spurious conflict line