adding a conflicting change