Merge old and new version of Types.cpp