made a conflicting change