changed conflict line