made conflicting changes local