testing conflicting changes