added a conflicting change