a conflicting change