type system update v1
type system v2
resolve confilct v1