made a conflicting change
what have I done