changed conflict