updating types
merging