Changed ClassOrInterfaceType merge policy