some more conflicting changes