more conflicting changes!