add prop type
merge