a conflicting change
resolved conflict